Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-iot/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
    config:
      failFast: true
      username: jw
      password: jkzl
      password: Zjxl2023*
---
spring: