luowei 2 роки тому
батько
коміт
73c32973fb

+ 1 - 1
soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysRole.java

@@ -44,7 +44,7 @@ public class SysRole extends BaseEntity
      */
     private Boolean deptCheckStrictly;
     /** 角色状态 (0正常,1停用)*/
-    private Integer status;
+    private String status;
 
     /** 删除标识 (0正常,1删除)*/
     private Integer delFlag;

+ 3 - 3
soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUser.java

@@ -51,7 +51,7 @@ public class SysUser extends BaseEntity {
      * 启用/禁用
      */
     @ApiModelProperty(value = "启用/禁用")
-    private Long isLock;
+    private String isLock;
 
     /**
      * 岗位
@@ -172,7 +172,7 @@ public class SysUser extends BaseEntity {
      * 是否签署 0未签署 1已签署
      */
     @ApiModelProperty(value = "是否签署 0未签署 1已签署")
-    private Long isSign;
+    private String isSign;
 
     /**
      * 签署时间
@@ -203,7 +203,7 @@ public class SysUser extends BaseEntity {
      * 是否锁定,0:未锁定.1:已锁定
      */
     @ApiModelProperty(value = "是否锁定,0:未锁定.1:已锁定")
-    private Long locked;
+    private String locked;
     /** 机构对象 */
     @TableField(exist = false)
     private Org org;

+ 0 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

@@ -78,7 +78,6 @@ public class SysRoleController extends BaseController
             return error("新增角色'" + role.getRoleName() + "'失败,角色权限已存在");
         }
         role.setCreateBy(SecurityUtils.getUsername());
-        role.setStatus(0);
         return toAjax(roleService.insertRole(role));
 
     }

+ 2 - 2
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysMenu.java

@@ -99,13 +99,13 @@ public class SysMenu extends BaseEntity {
      * 菜单状态(0显示 1隐藏)
      */
     @ApiModelProperty(value = "菜单状态" , notes = "0=显示,1=隐藏")
-    private Long visible;
+    private String visible;
 
     /**
      * 菜单状态(0正常 1停用)
      */
     @ApiModelProperty(value = "菜单状态" , notes = "0=正常,1=停用")
-    private Long status;
+    private String status;
 
     /**
      * 权限标识