-
# Conflicts: # yudao-server/src/main/resources/application-local.yaml
-
…ringBootApplicationYaml,避免出现很难看的报错提醒!!!
-
# Conflicts: # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
# Conflicts: # yudao-server/src/main/resources/application-local.yaml
…ringBootApplicationYaml,避免出现很难看的报错提醒!!!
# Conflicts: # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java