-
Merge pull request !1219 from puhui999/develop
-
# Conflicts: # yudao-dependencies/pom.xml # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotProductStatusEnum.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/thingmodel/IotThingModelTypeEnum.java
-
【升级】velocity from 2.4 to 2.4.1 【升级】guava from 33.3.1 to 33.4.0
-
# Conflicts: # pom.xml # yudao-dependencies/pom.xml # yudao-server/pom.xml