Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 6cf36f0e43c9add691b9a375526ce7dc26209574

 server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java

@@ -120,6 +120,11 @@
    @ApiModelProperty(value = "密码错误次数", example = "1")
    private Integer errTimes;

    @ApiModelProperty(value = "初始化密码", example = "1")
    private String firstPassword;

    @ApiModelProperty(value = "禁止操作最后日志", example = "1")
    private String prohibitRemark;

    @ApiModelProperty(value = "0 启用 1 禁用")
    private Integer status;