-
# Conflicts: # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
-
# Conflicts: # yudao-server/src/main/resources/application-local.yaml
-
# Conflicts: # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
-
# Conflicts: # pom.xml # yudao-dependencies/pom.xml # yudao-server/pom.xml
-
Merge pull request !1011 from 芋道源码/develop
