rev:修改流程服务配置

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/node/impl/ServerTaskConverter.java

@@ -26,9 +26,11 @@ public class ServerTaskConverter extends BaseNodeConverter {
         form.setForm_type(properties.getString("form_type"));
         JSONObject carry = model.getAuxParam();
         if (carry!=null){
-            form.setAuxParam(carry);
-        }else {
-            form.setAuxParam(properties.getJSONObject("auxParam"));
+            if (form.getAuxParam()!=null){
+                form.getAuxParam().putAll(carry);
+            }else {
+                form.setAuxParam(carry);
+            }
         }
         form.setName(properties.getString("name"));
         form.setDocumentation(properties.getString("documentation"));