diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index dd86d12..2e108ed 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -254,9 +254,9 @@ public class CommonEnumUtil { public enum USER_STATUS { NORMAL(1, "正常", "正常_NORMAL"), FREEZE(2, "冻结", "冻结_FREEZE"), - ABERRANT(3, "异常", "异常_ABERRANT"), - RESIGNATION(4, "离职", "离职_RESIGNATION"), - EXPIRE(5, "服务到期", "服务到期_EXPIRE"), +// ABERRANT(3, "异常", "异常_ABERRANT"), +// RESIGNATION(4, "离职", "离职_RESIGNATION"), +// EXPIRE(5, "服务到期", "服务到期_EXPIRE"), LOCKING(6, "锁定", "fa cell-fa fa-lock"), ENABLE(7, "启用", "fa fa-success cell-fa fa-check"), DISABLE(8, "禁止", "fa fa-disabled cell-fa fa-times-circle"); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 58ba574..aa8244a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -51,12 +51,10 @@ public class SysUser extends BaseBean { @ApiParam(value ="用户名称" , access ="用户名称") private String userName; - @Column(name="USER_LOGIN_NAME") @ApiParam(value ="登陆名称" , access ="登陆名称") private String userLoginName; - @JsonIgnore @Column(name="USER_LOGIN_PASSWORD") @ApiParam(value ="登陆密码") private String userLoginPassword;