-
# Conflicts: # yudao-server/src/main/resources/application-local.yaml
-
…ringBootApplicationYaml,避免出现很难看的报错提醒!!!
-
Merge pull request !1269 from puhui999/iot
# Conflicts: # yudao-server/src/main/resources/application-local.yaml
…ringBootApplicationYaml,避免出现很难看的报错提醒!!!
Merge pull request !1269 from puhui999/iot