Merge branch 'master' into test

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

@@ -1,5 +1,5 @@
 server:
-  port: 8051
+  port: 9071
 
 #微服务相关配置
 cloud:
@@ -13,7 +13,7 @@ xxl:
     executor:
       appname: device-app
       ip: ${cloud.service.ip}
-      port: 8061
+      port: 9081
 
 #雪花ID唯一标识
 workerId: 10