Browse Source

给数据库用户表添加字段: 是否启用

v_HuilingDeng 4 years ago
parent
commit
a72d512af6

+ 5 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/UserInfo.java

@@ -47,7 +47,7 @@ public class UserInfo {
     private Integer isAbi;
 
     @ApiModelProperty(value = "部门id")
-    private Long departmentId;
+    private Long deptId;
 
     @ApiModelProperty(value = "供应商id")
     private Long factoryId;
@@ -58,7 +58,10 @@ public class UserInfo {
     @ApiModelProperty(value = "角色code")
     private String roleCode;
 
-	@ApiModelProperty(value = "创建时间")
+    @ApiModelProperty(value = "是否启用")
+    private Integer isEnable;
+
+    @ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 
 	@ApiModelProperty(value = "创建人id")

+ 3 - 2
abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserInfoMapper.xml

@@ -12,9 +12,10 @@
         <result column="LOGIN_NAME" property="loginName" />
         <result column="PASSWORD" property="password" />
         <result column="is_abi" property="isAbi" />
-        <result column="department_id" property="departmentId" />
+        <result column="dept_id" property="deptId" />
         <result column="factory_id" property="factoryId" />
         <result column="role_id" property="roleId" />
+        <result column="is_enable" property="isEnable" />
         <result column="role_code" property="roleCode" />
         <result column="CREATE_TIME" property="createTime" />
         <result column="CREATE_BY" property="createBy" />
@@ -24,7 +25,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, USER_NAME, EMPLOYEE_NO, PHONE, EMAIL, LOGIN_NAME, PASSWORD, is_abi, department_id, factory_id, role_id, role_code, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
+        ID, USER_NAME, EMPLOYEE_NO, PHONE, EMAIL, LOGIN_NAME, PASSWORD, is_abi, dept_id, factory_id, role_id, role_code, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
     </sql>
 
 </mapper>