YunaiV c80ffe437f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ...

# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java

2025-10-02 18:52:15 +08:00

..

yudao-module-product

reactor：@MockBean => @MockitoBean

2025-08-02 17:58:49 +08:00

yudao-module-promotion

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

2025-10-02 18:52:15 +08:00

yudao-module-statistics

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

2025-07-26 17:25:10 +08:00

yudao-module-trade

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

2025-08-31 10:08:12 +08:00

yudao-module-trade-api

fix: 修复拼团还没成团，虚拟成团是否，这个时候核销也能核销成功

2025-06-18 17:23:59 +08:00

pom.xml

reactor：移除 mall-trade 的 api 包

2025-05-17 11:31:10 +08:00