Merge remote-tracking branch 'origin/master' into master-碰一下

device-start/src/main/resources/bootstrap-prod.yml

@@ -4,7 +4,7 @@ cloud:
     url: 172.25.143.101:8848
   service:
     name: device
-    ip: 172.25.143.100
+    ip: 172.25.143.101
 
 #xxl-job配置
 xxl:

device-start/src/main/resources/bootstrap-prod2.yml

@@ -7,7 +7,7 @@ cloud:
     url: 172.25.143.101:8848
   service:
     name: device
-    ip: 172.25.143.100
+    ip: 172.25.143.101
 
 #xxl-job配置
 xxl: