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

# Conflicts:
#	imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -327,6 +327,7 @@ public class TaskWorkNode {
         //业务类型
         String bizType = conMap.get("bizType")== null ? "" : conMap.get("bizType").toString();
 
+
         //出入库类型
         String stockType = conMap.get(DemoLineConstant.DEMOLINE_STOCK_TYPE) == null ? "" : conMap.get(DemoLineConstant.DEMOLINE_STOCK_TYPE).toString();
 
@@ -334,11 +335,11 @@ public class TaskWorkNode {
         //jsonObject.put("businessType", taskNode.getAutoNodeCode());
         jsonObject.put("taskId", taskNode.getTaskId());
         jsonObject.put("taskNodeId", taskNode.getId());
-        jsonObject.put("data", conMap.get("data"));
         jsonObject.put("bizType", bizType);
         //jsonObject.put("uid", taskNode.getCreateUser() + "");
-        jsonObject.put("url",  conMap.get("url"));
+        jsonObject.put("url",  conMap.get("ip"));
         jsonObject.put("port", conMap.get("port"));
+        jsonObject.put("data", conMap.get("data"));
 
         //业务回调数据
         JSONObject bizJsonObject = new JSONObject();