Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev

Conflicts:
	svr/svr-iot/src/main/resources/application.yml

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -35,7 +35,7 @@ spring:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: http://192.168.1.220:10080/jiwei/jw.config.git
          uri: http://192.168.1.220:10080/jiwei/wlyy2.0.config.git
        default-label: master
@@ -48,7 +48,7 @@ spring:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: http://192.168.1.220:10080/jiwei/jw.config.git
          uri: http://192.168.1.220:10080/jiwei/wlyy2.0.config.git
        default-label: master
---