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

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -357,8 +357,8 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         if (!isOn){
             //查看是否置业顾问
             if (taUser.getIsConsultant()){
-                taUser.setIsConsultant(false);
-                taUserMapper.updateById(taUser);
+//                taUser.setIsConsultant(false);
+//                taUserMapper.updateById(taUser);
                 //小程序端调整为普通客户
                 QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
                 taPersonQueryWrapper.eq("user_id",id);

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -251,7 +250,6 @@ public class TaPerson implements Serializable {
 
     private Integer orgId;
 
-    @TableField(strategy = FieldStrategy.IGNORED)
     private Integer userId;
 
     private String userPort;

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -982,7 +982,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
 
             TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
-            customer.setVerifyStatus(CommConstant.VERIFY_READY);
+            customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
             customer.setStatus(CommConstant.CUSTOMER_REPORT);
             customer.setEntryType(CommConstant.ENTRY_INPUT);
             customer.setCreateDate(now);