Merge remote-tracking branch 'origin/master' into prod_test

src/main/java/cn/cslg/pas/service/common/PatentStarApiService.java

@@ -1062,7 +1062,6 @@ public class PatentStarApiService {
      * @return
      */
     public List<Text> getCnFullText(String appNo) {
-        appNo = "202410796708";
         List<Text> pubTextList = new ArrayList<>();
         //获取公开说明书
         String cnFullXmlApi = null;

src/main/java/cn/cslg/pas/service/test/PermissionService2.java

@@ -24,7 +24,7 @@ public class PermissionService2 {
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
-                .url("http://47.116.194.135:8085" + "/api/permission/api/admin/loginByEncryption")
+                .url("https://xsip.cn" + "/api/permission/api/admin/loginByEncryption")
                 .post(requestBody)
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
@@ -44,7 +44,7 @@ public class PermissionService2 {
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
-                .url("http://47.116.194.135:8085" + "/api/permission/api/admin/functionByEncryption")
+                .url("https://xsip.cn" + "/api/permission/api/admin/functionByEncryption")
                 .addHeader("Cookie", "token="+token)
                 .post(requestBody)
                 .build();

src/main/resources/jsons/invalidReportProject.json

@@ -278,7 +278,7 @@
     "defaultHidden": "true",
     "ifShow": "true"
   },
-  {"name":"描述",
+  {"name":"备注",
     "type":"String",
     "value":"description",
     "field": "description",

src/main/resources/jsons/reportProject.json

@@ -195,7 +195,7 @@
     "ifGroup": "false",
     "ifShow": "true"
   },
-  {"name":"描述",
+  {"name":"备注",
     "type":"String",
     "value":"description",
     "field": "description",