refactor: 拆分多租户

src/main/java/com/youlai/boot/system/model/entity/Dept.java

@@ -1,6 +1,8 @@
 package com.youlai.boot.system.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/youlai/boot/system/model/entity/Log.java

@@ -1,6 +1,7 @@
 package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.youlai.boot.common.enums.LogModuleEnum;
 import lombok.Data;
 
@@ -107,5 +108,4 @@ public class Log implements Serializable {
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
-
 }

src/main/java/com/youlai/boot/system/model/entity/Notice.java

@@ -1,6 +1,8 @@
 package com.youlai.boot.system.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/youlai/boot/system/model/entity/Role.java

@@ -1,6 +1,8 @@
 package com.youlai.boot.system.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/youlai/boot/system/model/entity/RoleMenu.java

@@ -1,6 +1,8 @@
 package com.youlai.boot.system.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/youlai/boot/system/model/entity/Tenant.java

@@ -1,71 +0,0 @@
-package com.youlai.boot.system.model.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.boot.common.base.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDateTime;
-
-/**
- * 租户实体
- *
- * @author Ray.Hao
- * @since 3.0.0
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("sys_tenant")
-public class Tenant extends BaseEntity {
-
-    /**
-     * 租户名称
-     */
-    private String name;
-
-    /**
-     * 租户编码（唯一）
-     */
-    private String code;
-
-    /**
-     * 联系人姓名
-     */
-    private String contactName;
-
-    /**
-     * 联系人电话
-     */
-    private String contactPhone;
-
-    /**
-     * 联系人邮箱
-     */
-    private String contactEmail;
-
-    /**
-     * 租户域名（用于域名识别）
-     */
-    private String domain;
-
-    /**
-     * 租户Logo
-     */
-    private String logo;
-
-    /**
-     * 状态(1-正常 0-禁用)
-     */
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 过期时间（NULL表示永不过期）
-     */
-    private LocalDateTime expireTime;
-}
-

src/main/java/com/youlai/boot/system/model/entity/User.java

@@ -1,6 +1,8 @@
 package com.youlai.boot.system.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,13 +20,11 @@ public class User extends BaseEntity {
      */
     private String username;
 
-
     /**
      * 昵称
      */
     private String nickname;
 
-
     /**
      * 性别((1-男 2-女 0-保密)
      */

src/main/java/com/youlai/boot/system/model/entity/UserNotice.java

@@ -1,9 +1,11 @@
 package com.youlai.boot.system.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.youlai.boot.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;