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

mhd_oms/pom.xml

@@ -90,7 +90,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.38</version>
+            <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
         <!--链路追踪-->
@@ -127,19 +127,6 @@
             <groupId>com.mhd</groupId>
             <artifactId>mhd-common-log</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.mhd</groupId>-->
-<!--            <artifactId>mhd-modules-system</artifactId>-->
-<!--            <version>3.6.0</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
-        <dependency>
-            <groupId>com.mhd</groupId>
-            <artifactId>mhd-user-center</artifactId>
-            <version>3.6.0</version>
-            <scope>compile</scope>
-        </dependency>
-
 
     </dependencies>
 
@@ -179,4 +166,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>

mhd_oms/src/main/resources/bootstrap.yml

@@ -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
         # 测试开发环境