-
Merge pull request !1269 from puhui999/iot
-
Merge pull request !1255 from puhui999/iot
-
# Conflicts: # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
-
Merge pull request !1243 from 陈玄礼/feature/iot-ota-shelly
-
Merge pull request !1248 from puhui999/iot