【7.6.0】【sys】整理实体

kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/entity/HrPosition.java

@@ -1,6 +1,6 @@
 package cn.stylefeng.roses.kernel.sys.modular.position.entity;
 
-import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -17,10 +17,10 @@ import java.math.BigDecimal;
  * @author fengshuonan
  * @date 2023/06/10 21:25
  */
-@TableName("hr_position")
+@TableName(value = "hr_position", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class HrPosition extends BaseEntity {
+public class HrPosition extends BaseExpandFieldEntity {
 
     /**
      * 主键
@@ -64,32 +64,4 @@ public class HrPosition extends BaseEntity {
     @ChineseDescription("备注")
     private String remark;
 
-    /**
-     * 拓展字段
-     */
-    @TableField("expand_field")
-    @ChineseDescription("拓展字段")
-    private String expandField;
-
-    /**
-     * 乐观锁
-     */
-    @TableField("version_flag")
-    @ChineseDescription("乐观锁")
-    private Long versionFlag;
-
-    /**
-     * 删除标记：Y-已删除，N-未删除
-     */
-    @TableField("del_flag")
-    @ChineseDescription("删除标记：Y-已删除，N-未删除")
-    private String delFlag;
-
-    /**
-     * 租户号
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户号")
-    private Long tenantId;
-
 }

kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java

@@ -1,6 +1,6 @@
 package cn.stylefeng.roses.kernel.sys.modular.user.entity;
 
-import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -17,10 +17,10 @@ import java.util.Date;
  * @author fengshuonan
  * @date 2023/06/10 21:26
  */
-@TableName("sys_user")
+@TableName(value = "sys_user", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class SysUser extends BaseEntity {
+public class SysUser extends BaseExpandFieldEntity {
 
     /**
      * 主键
@@ -141,32 +141,4 @@ public class SysUser extends BaseEntity {
     @ChineseDescription("对接外部主数据的用户id")
     private String masterUserId;
 
-    /**
-     * 拓展字段
-     */
-    @TableField("expand_field")
-    @ChineseDescription("拓展字段")
-    private String expandField;
-
-    /**
-     * 乐观锁
-     */
-    @TableField("version_flag")
-    @ChineseDescription("乐观锁")
-    private Long versionFlag;
-
-    /**
-     * 删除标记：Y-已删除，N-未删除
-     */
-    @TableField("del_flag")
-    @ChineseDescription("删除标记：Y-已删除，N-未删除")
-    private String delFlag;
-
-    /**
-     * 租户号
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户号")
-    private Long tenantId;
-
 }

kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/app/entity/SysApp.java

@@ -1,6 +1,6 @@
 package cn.stylefeng.roses.kernel.sys.modular.app.entity;
 
-import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -17,10 +17,10 @@ import java.math.BigDecimal;
  * @author fengshuonan
  * @date 2023/06/10 21:28
  */
-@TableName("sys_app")
+@TableName(value = "sys_app", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class SysApp extends BaseEntity {
+public class SysApp extends BaseExpandFieldEntity {
 
     /**
      * 主键id
@@ -71,32 +71,4 @@ public class SysApp extends BaseEntity {
     @ChineseDescription("备注")
     private String remark;
 
-    /**
-     * 拓展字段
-     */
-    @TableField("expand_field")
-    @ChineseDescription("拓展字段")
-    private String expandField;
-
-    /**
-     * 乐观锁
-     */
-    @TableField("version_flag")
-    @ChineseDescription("乐观锁")
-    private Long versionFlag;
-
-    /**
-     * 删除标记：Y-已删除，N-未删除
-     */
-    @TableField("del_flag")
-    @ChineseDescription("删除标记：Y-已删除，N-未删除")
-    private String delFlag;
-
-    /**
-     * 租户号
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户号")
-    private Long tenantId;
-
 }

kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenu.java

@@ -1,6 +1,6 @@
 package cn.stylefeng.roses.kernel.sys.modular.menu.entity;
 
-import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -17,10 +17,10 @@ import java.math.BigDecimal;
  * @author fengshuonan
  * @date 2023/06/10 21:28
  */
-@TableName("sys_menu")
+@TableName(value = "sys_menu", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class SysMenu extends BaseEntity {
+public class SysMenu extends BaseExpandFieldEntity {
 
     /**
      * 主键
@@ -134,32 +134,4 @@ public class SysMenu extends BaseEntity {
     @ChineseDescription("是否可见(分离版用)：Y-是，N-否")
     private String antdvVisible;
 
-    /**
-     * 拓展字段
-     */
-    @TableField("expand_field")
-    @ChineseDescription("拓展字段")
-    private String expandField;
-
-    /**
-     * 乐观锁
-     */
-    @TableField("version_flag")
-    @ChineseDescription("乐观锁")
-    private Long versionFlag;
-
-    /**
-     * 删除标记：Y-已删除，N-未删除
-     */
-    @TableField("del_flag")
-    @ChineseDescription("删除标记：Y-已删除，N-未删除")
-    private String delFlag;
-
-    /**
-     * 租户号
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户号")
-    private Long tenantId;
-
 }

kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/SysRole.java

@@ -1,6 +1,6 @@
 package cn.stylefeng.roses.kernel.sys.modular.role.entity;
 
-import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -17,10 +17,10 @@ import java.math.BigDecimal;
  * @author fengshuonan
  * @date 2023/06/10 21:29
  */
-@TableName("sys_role")
+@TableName(value = "sys_role", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class SysRole extends BaseEntity {
+public class SysRole extends BaseExpandFieldEntity {
 
     /**
      * 主键id
@@ -78,32 +78,4 @@ public class SysRole extends BaseEntity {
     @ChineseDescription("是否是系统角色：Y-是，N-否。系统角色不能删除")
     private String roleSystemFlag;
 
-    /**
-     * 拓展字段
-     */
-    @TableField("expand_field")
-    @ChineseDescription("拓展字段")
-    private String expandField;
-
-    /**
-     * 乐观锁
-     */
-    @TableField("version_flag")
-    @ChineseDescription("乐观锁")
-    private Long versionFlag;
-
-    /**
-     * 删除标记：Y-已删除，N-未删除
-     */
-    @TableField("del_flag")
-    @ChineseDescription("删除标记：Y-已删除，N-未删除")
-    private String delFlag;
-
-    /**
-     * 租户号
-     */
-    @TableField("tenant_id")
-    @ChineseDescription("租户号")
-    private Long tenantId;
-
 }