-
Merge pull request !1500 from 芋道源码/feature/iot-udp
-
Conflicts: src/main/resources/application-local.yaml
-
Conflicts: src/main/resources/application.yaml
-
梳理 druid 的配置
-
Conflicts: pom.xml src/main/resources/application-local.yaml
Merge pull request !1500 from 芋道源码/feature/iot-udp
Conflicts: src/main/resources/application-local.yaml
Conflicts: src/main/resources/application.yaml
梳理 druid 的配置
Conflicts: pom.xml src/main/resources/application-local.yaml