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

src/main/java/cn/cslg/pas/common/model/dify/OAParamDTO.java

@@ -12,4 +12,8 @@ public class OAParamDTO {
     private String patentFileUrls;
     private String appFileGuid;
     private String modifyFileGuid;
+    private String changeClaim;
+    private String claim;
+    private String mainClaimReason;
+    private Integer nearIndex;
 }

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

@@ -529,6 +529,10 @@ public class DifyService {
         map.put("app_file_guid",appFileGuid);
         map.put("modify_file_guid",modifyFileGuid);
         map.put("patent_files", new ArrayList<>());
+        map.put("changeClaim", vo.getChangeClaim());
+        map.put("claim", vo.getClaim());
+        map.put("main_claim_reason", vo.getMainClaimReason());
+        map.put("near_index", vo.getNearIndex());
 
         OAMessageDTO oaMessageDTO = new OAMessageDTO();
         oaMessageDTO.setInputs(map);
@@ -702,7 +706,7 @@ public class DifyService {
         XWPFTemplate template = null;
         try {
             HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy();
-            ConfigureBuilder configureBuilder = Configure.builder();
+            ConfigureBuilder configureBuilder = Configure.builder().useSpringEL(false);
             configureBuilder.bind("#this", htmlRenderPolicy);
             Configure configure = configureBuilder.build();
             template = XWPFTemplate.compile(filePath, configure).render(map);