Files
ruoyi-vue-pro/yudao-module-iot/yudao-module-iot-gateway
YunaiV fa159b4bef Merge branch 'feature/iot-protocol' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot-modbus
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
#	yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/IotDeviceCommonApi.java
#	yudao-module-iot/yudao-module-iot-gateway/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
#	yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
#	yudao-module-iot/yudao-module-iot-gateway/src/main/resources/application.yaml
#	yudao-module-iot/yudao-module-iot-gateway/src/test/resources/tcp-binary-packet-examples.md
#	yudao-module-iot/yudao-module-iot-gateway/src/test/resources/tcp-json-packet-examples.md
2026-02-01 19:30:54 +08:00
..