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
This commit is contained in:
王奎兴
2026-05-21 16:14:56 +08:00
41 changed files with 577 additions and 64 deletions
@@ -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>