Merge branch 'dev_20260429' into dev_WMS20260401

# Conflicts:
#	mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java
#	mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java

mhd-user-center/src/main/resources/bootstrap.yml

@@ -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.5: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.5: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
         # 共享配置

mhd-user-center/src/main/resources/mapper/UserMapper.xml

@@ -791,4 +791,11 @@
           AND u.business_type IN (1, 3)
          AND u.user_Id = #{userId}
     </select>
+    <select id="selectYmsByUserId" resultType="com.mhd.common.core.domain.dto.YmsSysUserDTO">
+        select * from NGWL_TEST_YMS.SYS_USER where SZWL_USER_ID = #{userId}
+    </select>
+    <select id="getOrdIsQueue" resultType="java.lang.Integer">
+        SELECT is_queue from NGWL_TEST_PRODUCT.SYS_ORGANIZATION where ORGANIZATION_ID = #{organizationId}
+    </select>
+
 </mapper>