From 5bba8cbd6684bf239256cbb4ea42b34841a82d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= Date: Fri, 16 Jun 2023 11:06:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=9F=E6=88=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maku/system/entity/SysAttachmentEntity.java | 4 +++ .../net/maku/system/entity/SysDictDataEntity.java | 4 +++ .../net/maku/system/entity/SysDictTypeEntity.java | 4 +++ .../net/maku/system/entity/SysLogLoginEntity.java | 5 +++ .../maku/system/entity/SysLogOperateEntity.java | 5 +++ .../java/net/maku/system/entity/SysOrgEntity.java | 42 ++++++++++++---------- .../net/maku/system/entity/SysParamsEntity.java | 5 ++- .../java/net/maku/system/entity/SysPostEntity.java | 39 ++++++++++---------- .../java/net/maku/system/entity/SysRoleEntity.java | 42 ++++++++++++---------- .../java/net/maku/system/entity/SysUserEntity.java | 6 +++- 10 files changed, 98 insertions(+), 58 deletions(-) diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java index 56f3474..77f7f60 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysAttachmentEntity.java @@ -34,5 +34,9 @@ public class SysAttachmentEntity extends BaseEntity { * 存储平台 */ private String platform; + /** + * 租户ID + */ + private Long tenantId; } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java index 7871d1d..f0de6ab 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictDataEntity.java @@ -39,4 +39,8 @@ public class SysDictDataEntity extends BaseEntity { * 排序 */ private Integer sort; + /** + * 租户ID + */ + private Long tenantId; } diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java index d39a11b..430d73e 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java @@ -39,4 +39,8 @@ public class SysDictTypeEntity extends BaseEntity { * 动态sql */ private String dictSql; + /** + * 租户ID + */ + private Long tenantId; } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysLogLoginEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysLogLoginEntity.java index dfa945e..e602673 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysLogLoginEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysLogLoginEntity.java @@ -58,5 +58,10 @@ public class SysLogLoginEntity { */ @TableField(fill = FieldFill.INSERT) private Date createTime; + + /** + * 租户ID + */ + private Long tenantId; } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysLogOperateEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysLogOperateEntity.java index 9b78b1d..446bc9b 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysLogOperateEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysLogOperateEntity.java @@ -100,4 +100,9 @@ public class SysLogOperateEntity { @TableField(fill = FieldFill.INSERT) private Date createTime; + /** + * 租户ID + */ + private Long tenantId; + } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java index 73ad77e..887f287 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysOrgEntity.java @@ -8,29 +8,33 @@ import net.maku.framework.mybatis.entity.BaseEntity; /** * 机构管理 - * + * * @author 阿沐 babamu@126.com * MAKU */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("sys_org") public class SysOrgEntity extends BaseEntity { - /** - * 上级ID - */ - private Long pid; - /** - * 机构名称 - */ - private String name; - /** - * 排序 - */ - private Integer sort; - /** - * 上级名称 - */ - @TableField(exist = false) - private String parentName; + /** + * 上级ID + */ + private Long pid; + /** + * 机构名称 + */ + private String name; + /** + * 排序 + */ + private Integer sort; + /** + * 上级名称 + */ + @TableField(exist = false) + private String parentName; + /** + * 租户ID + */ + private Long tenantId; } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysParamsEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysParamsEntity.java index d07e229..7954366 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysParamsEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysParamsEntity.java @@ -41,5 +41,8 @@ public class SysParamsEntity extends BaseEntity { */ private String remark; - + /** + * 租户ID + */ + private Long tenantId; } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java index 8411056..4808be3 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysPostEntity.java @@ -12,24 +12,27 @@ import net.maku.framework.mybatis.entity.BaseEntity; * MAKU */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("sys_post") public class SysPostEntity extends BaseEntity { - /** - * 岗位编码 - */ - private String postCode; - /** - * 岗位名称 - */ - private String postName; - /** - * 排序 - */ - private Integer sort; - /** - * 状态 0：停用 1：正常 - */ - private Integer status; - + /** + * 岗位编码 + */ + private String postCode; + /** + * 岗位名称 + */ + private String postName; + /** + * 排序 + */ + private Integer sort; + /** + * 状态 0：停用 1：正常 + */ + private Integer status; + /** + * 租户ID + */ + private Long tenantId; } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java index efdfdaa..bca9a5c 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysRoleEntity.java @@ -10,29 +10,33 @@ import net.maku.system.enums.DataScopeEnum; /** * 角色 - * + * * @author 阿沐 babamu@126.com * MAKU */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("sys_role") public class SysRoleEntity extends BaseEntity { - /** - * 角色名称 - */ - private String name; - /** - * 备注 - */ - private String remark; - /** - * 数据范围 {@link DataScopeEnum} - */ - private Integer dataScope; - /** - * 机构ID - */ - @TableField(fill = FieldFill.INSERT) - private Long orgId; + /** + * 角色名称 + */ + private String name; + /** + * 备注 + */ + private String remark; + /** + * 数据范围 {@link DataScopeEnum} + */ + private Integer dataScope; + /** + * 机构ID + */ + @TableField(fill = FieldFill.INSERT) + private Long orgId; + /** + * 租户ID + */ + private Long tenantId; } diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java index b049009..e54a04f 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysUserEntity.java @@ -60,6 +60,10 @@ public class SysUserEntity extends BaseEntity { /** * 机构名称 */ - @TableField(exist=false) + @TableField(exist = false) private String orgName; + /** + * 租户ID + */ + private Long tenantId; }