YunaiV 14add8edf0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud ... # Conflicts: # yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.java # yudao-module-member/yudao-module-member-server/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java		2026-05-31 20:48:47 +08:00
..
src	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2026-05-31 20:48:47 +08:00
Dockerfile	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2025-05-17 14:26:06 +08:00
pom.xml	fix：【mall】优惠劵：相关的判断不对，关联 https://t.zsxq.com/fYaKv	2025-12-27 21:41:46 +08:00