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

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.center.taUser.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;
@@ -116,6 +117,7 @@ public class TaUser implements Serializable {
     /**
      * 权重
      */
+    @TableField(strategy= FieldStrategy.IGNORED)
     private String weight;
 
     /**

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

@@ -476,6 +476,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (!StringUtils.isEmpty(taUser.getWeight()) && taUser.getWeight().length() > 11){
 			throw new Exception("权重最大为11位");
 		}
+		if (StringUtils.isEmpty(taUser.getWeight())){
+			taUser.setWeight(null);
+		}
 		if(StringUtils.isEmpty(taUser.getLoginName()) && taUserBefore.getLoginName().equals(taUserBefore.getPhone())){
 			taUser.setLoginName(taUser.getPhone());
 		}