Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/resources/application-v3.yml

@@ -4,14 +4,14 @@ spring:
   application:
     name: estateagents
   datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.0?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
+   username: estateagents
+   password: DQ@0lW##kBb2+-jPZ
+   url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.0?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+   driver-class-name: com.mysql.cj.jdbc.Driver
+   initial-size: 10 # 初始化连接数
+   max-active: 20 # 最大连接数
+   min-idle: 8 # 最小空闲数
+   max-idle: 8 # 最大空闲数
   servlet:
     multipart:
       max-file-size: 10MB