Merge branch 'master' of csk/cus-wms-supervise2.0 into master

src/main/java/com/emato/cus/supervise/biz/acqGoodsMoveSchedule/up/AcqGoodsMoveUpDataConversion.java

@@ -131,7 +131,7 @@ public class AcqGoodsMoveUpDataConversion implements DataConversion {
                 } else {
                     cusAcqGoodsMove05.setStoreCode(Dict.storeCodeMap.get("Others"));
                 }
-                cusAcqGoodsMove05.setStoreCode(Dict.storeCode);
+                //cusAcqGoodsMove05.setStoreCode(Dict.storeCode);
                 cusAcqGoodsMove05.setCreateTime(LocalDateTime.now());
                 cusAcqGoodsMove05.setCreaterSn(Dict.operater);
                 cusAcqGoodsMove05.setModerSn(Dict.operater);

src/main/resources/application.yml

@@ -11,7 +11,7 @@ server:
     ## 生产环境
     address: 172.18.0.193
     ## 开发测试环境
-    # address: 127.0.0.1
+    #address: 127.0.0.1
     port: 6666