Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, 在线编辑 修改传参

See merge request LiuChao/foton-slrs-system-rest!400

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -23,7 +23,7 @@ import java.util.Set;
 public interface workFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/busProcessModel/saveEditFile",method = RequestMethod.GET)
-    BusProcessModelHis saveEditFile();
+    BusProcessModelHis saveEditFile(@RequestParam("model") String model);
 
     @RequestMapping(value = "/bat-wkflow/busProcessModel/processEditFile",method = RequestMethod.GET)
     BusProcessModelHis processEditFile(@RequestParam("id") String id);

adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java

@@ -30,8 +30,8 @@ public class workFlowFeignClientImpl {
     @Autowired
     private IUserEOService userEOService;
 
-    public BusProcessModelHis saveEditFile(){
+    public BusProcessModelHis saveEditFile(@RequestParam("model") String model){
-        BusProcessModelHis stringWrapper = workFlowFeignClient.saveEditFile();
+        BusProcessModelHis stringWrapper = workFlowFeignClient.saveEditFile(model);
         return stringWrapper;
     }
 

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -115,8 +115,8 @@ public class WorkFlowController {
 
     @ApiOperation(value = "存储在线编辑文件")
     @GetMapping("/saveEditFile")
-    public BusProcessModelHis saveEditFile(){
+    public BusProcessModelHis saveEditFile(String model){
-        return  workFlowFeignClient.saveEditFile();
+        return  workFlowFeignClient.saveEditFile(model);
     }
 
     @ApiOperation(value = "查询在线编辑流程汇总文件编辑对象")