Merge branch 'dev' into dev_WMS20260401

# Conflicts: # mhd-user-center/src/main/resources/bootstrap.yml # mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java # mhd_oms/src/main/resources/bootstrap.yml # mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml
2026-06-16 11:11:48 +08:00
parent b05baac0e5 9922fee6cc
commit dd4fc13adc
46 changed files with 660 additions and 225 deletions
@@ -20,17 +20,17 @@ spring:
      discovery:
 #        server-addr: 127.0.0.1:8848
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.33.0.129:6010
-#        server-addr: 10.102.192.31:6848
-#        username: nacos
-#        password: manhuoda@2023
+#        server-addr: 10.33.0.129:6010
+        server-addr: 10.102.192.31:6848
+        username: nacos
+        password: manhuoda@2023
      config:
 #        server-addr: 127.0.0.1:8848
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.33.0.129:6010
-#        server-addr: 10.102.192.31:6848
-#        username: nacos
-#        password: manhuoda@2023
+#        server-addr: 10.33.0.129:6010
+        server-addr: 10.102.192.31:6848
+        username: nacos
+        password: manhuoda@2023
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置