Merge remote-tracking branch 'origin/master'

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java

@@ -6,6 +6,7 @@ import com.bonus.sgzb.common.core.annotation.Excel.Type;
 import com.bonus.sgzb.common.core.annotation.Excels;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
 import com.bonus.sgzb.common.core.xss.Xss;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -56,6 +57,7 @@ public class SysUser extends BaseEntity
     private String avatar;
 
     /** 密码 */
+    @JsonIgnore
     private transient String password;
 
     /** 帐号状态（0正常 1停用） */
@@ -92,6 +94,16 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     private Long roleId;
 
+    public String getForceChangePwd() {
+        return forceChangePwd;
+    }
+
+    public void setForceChangePwd(String forceChangePwd) {
+        this.forceChangePwd = forceChangePwd;
+    }
+
+    /**强制修改密码  1 强制修改  0 不修改*/
+    private String forceChangePwd;
     /** 导出选中列表 */
     private List<Long> dataCondition;