Merge branch 'master' of http://git.jiayuepowertech.com:9022/xusl/pfr

# Conflicts:
#	backend/src/main/resources/application.yml

backend/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
       stat-view-servlet.enabled: false
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://192.168.1.168:3306/pfr?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.205:3306/pfr?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     username: root
     password: '!QAZ2root'