-
# Conflicts: # yudao-dependencies/pom.xml # yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayConfiguration.java # yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayProperties.java
-
Merge pull request !1505 from puhui999/feature/iot
-
Merge pull request !1500 from 芋道源码/feature/iot-udp
-
Merge pull request !1504 from 芋道源码/feature/iot-sub
-
…tewaySubDeviceHttpProtocolIntegrationTest 单测