Merge remote-tracking branch 'origin/dev2' into dev2

RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java

@@ -61,10 +61,9 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
         }
         for (int i = 0; i < patentRights.size(); i++) {
            String str = patentRights.get(i).getContent();
-            str = str.replace(" ", "");
             str = str.replace("\r", "");
             str =str.replace("\n","");
-            if(str.equals("")){
+            if(str.replace(" ","").equals("")){
                 patentRights.remove(i);
             }
             else{patentRights.get(i).setContent(str);