Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev

user-service/src/main/java/com/hp/user/service/entity/Account.java

@@ -1,8 +1,6 @@
 package com.hp.user.service.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -69,6 +67,8 @@ public class Account implements Serializable {
     /**
      * 对应企业/服务商Id
      */
+    // 更新时忽略null 和空值
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String companyId;
     /**
      * 备注