Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/entity/runbpm/BpmRunNodeVo.java

@@ -42,9 +42,6 @@ public class BpmRunNodeVo {
     // 审批备注
     private String approvalRemark;
 
-    public void setFormDataMap(Map<String, Object> formDataMap) {
-        this.formDataMap = formDataMap;
-    }
 
     public String getApprovalStatus() {
         return approvalStatus;
@@ -115,7 +112,7 @@ public class BpmRunNodeVo {
         return formDataMap;
     }
 
-    public void setFormDataMap(String formDataMap) {
+    public void setFormDataMapString(String formDataMap) {
         try {
             ObjectMapper objectMapper = new ObjectMapper();
             this.formDataMap = objectMapper.readValue(formDataMap, Map.class);
@@ -125,6 +122,11 @@ public class BpmRunNodeVo {
         }
     }
 
+    public void setFormDataMap(Map<String, Object> formDataMap) {
+        this.formDataMap = formDataMap;
+    }
+
+
     public String getTableName() {
         return tableName;
     }