Merge branch 'dev_erp' into dev_erp_gjy

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/GoblinErpTaskHandler.java

@@ -26,7 +26,7 @@ public class GoblinErpTaskHandler {
     }
 
     //订单
-    @XxlJob(value = "sev-platform:syncErpSpuStock")
+    @XxlJob(value = "sev-platform:pushErpTrade")
     public void pushErpTrade() {
         try {
             XxlJobHelper.handleSuccess("结果：" + feignGoblinErpTaskClient.pushErpTrade().getData());
@@ -37,7 +37,7 @@ public class GoblinErpTaskHandler {
     }
 
     //物流
-    @XxlJob(value = "sev-platform:syncErpSpuStock")
+    @XxlJob(value = "sev-platform:syncErpLogistic")
     public void syncErpLogistic() {
         try {
             XxlJobHelper.handleSuccess("结果：" + feignGoblinErpTaskClient.syncErpLogistic().getData());