Merge branch 'wms_dev' into wms_dev_hbbf

# Conflicts: # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java # mhd_oms/pom.xml
2026-02-09 14:29:47 +08:00
parent fa68e9dc0e 9cdb5a8896
commit 5d89fdc0a6
228 changed files with 17780 additions and 684 deletions
@@ -17,6 +17,8 @@ spring:
    nacos:
      discovery:
        server-addr: 127.0.0.1:8848
+        username: nacos
+        password: manhuoda@2023
        # 演示环境
        #        server-addr: 47.92.229.169:8848
        # 测试开发环境
@@ -31,6 +33,8 @@ spring:
      config:
        # 配置中心地址
        server-addr: 127.0.0.1:8848
+        username: nacos
+        password: manhuoda@2023
        # 演示环境
        #        server-addr: 47.92.229.169:8848
        # 测试开发环境