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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.4.4</version>
+	<version>v3.5</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -519,6 +519,12 @@ public class TaRecommendCustomerController extends BaseController {
                         taRecommendCustomer.setRealtyConsultant(taRecommendCustomer.getRecommendPerson());
                     }
                 }
+
+                // 审核不通过的时候，移除置业顾问选择
+                if (CommConstant.VERIFY_DISAGREE == verifyStatus) {
+                    taRecommendCustomer.setRealtyConsultant(null);
+                }
+
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)){
 
                     // 审核通过增加积分

src/main/resources/application-prod.yml

@@ -1,12 +1,12 @@
 server:
-  port: 8566
+  port: 8567
 spring:
   application:
     name: estateagents
   datasource:
     username: estateagents
     password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.5?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 # 最大连接数