11 Commits

Author SHA1 Message Date
YunaiV
a1c07f1924 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-11-24 18:24:19 +08:00
YunaiV
5dc81ab895 fix:【iot】单测报错的问题 2025-11-24 18:24:10 +08:00
YunaiV
25ebe6edef Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-10-02 17:59:00 +08:00
YunaiV
cd685e2304 【同步】BOOT 和 CLOUD 的功能 2025-10-02 17:58:54 +08:00
YunaiV
4f7a61d8d8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2025-10-02 17:57:47 +08:00
YunaiV
186bb144c9 【同步】BOOT 和 CLOUD 的功能 2025-10-02 17:57:40 +08:00
YunaiV
dd30e9e111 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
#	yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java
#	yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java
#	yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
#	yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java
#	yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java
#	yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
2025-10-02 17:56:24 +08:00
YunaiV
f02c004736 【同步】BOOT 和 CLOUD 的功能 2025-10-02 17:51:49 +08:00
YunaiV
edb5cdd372 【同步】BOOT 和 CLOUD 的功能 2025-08-31 10:25:40 +08:00
YunaiV
cbba929db8 feat:【IoT 物联网】新版本同步 2025-08-30 11:28:57 +08:00
YunaiV
a89b6d14a8 feat:【IoT 物联网】新版本同步 2025-08-30 09:34:40 +08:00