Merge branch 'master' into feature/sysconfig

src/main/java/com/youlai/system/model/entity/GenFieldConfig.java

@@ -96,4 +96,10 @@ public class GenFieldConfig extends BaseEntity {
     private String tsType;
 
 
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+
 }

src/main/java/com/youlai/system/model/entity/SysDept.java

@@ -1,8 +1,5 @@
 package com.youlai.system.model.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
 import com.youlai.system.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
@@ -16,11 +13,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SysDept extends BaseEntity {
-    /**
-     * 主键
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
 
     /**
      * 部门名称

src/main/java/com/youlai/system/model/entity/SysDict.java

@@ -1,7 +1,5 @@
 package com.youlai.system.model.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.youlai.system.common.base.BaseEntity;
 import lombok.Data;
 
@@ -13,11 +11,6 @@ import lombok.Data;
  */
 @Data
 public class SysDict extends BaseEntity {
-    /**
-     * 主键 
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
 
     /**
      * 类型名称

src/main/java/com/youlai/system/model/entity/SysRole.java

@@ -1,7 +1,5 @@
 package com.youlai.system.model.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.youlai.system.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
@@ -15,11 +13,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SysRole extends BaseEntity {
-    /**
-     * 主键
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
 
     /**
      * 角色名称

src/main/java/com/youlai/system/model/entity/SysUser.java

@@ -1,7 +1,5 @@
 package com.youlai.system.model.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.youlai.system.common.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,11 +10,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SysUser extends BaseEntity {
-    /**
-     * 用户 ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
 
     /**
      * 用户名

src/main/java/com/youlai/system/model/form/GenConfigForm.java

@@ -81,5 +81,8 @@ public class GenConfigForm {
         @Schema(description = "查询类型")
         private QueryTypeEnum queryType;
 
+        @Schema(description = "字典类型")
+        private String dictType;
+
     }
 }

src/main/java/com/youlai/system/model/query/TablePageQuery.java

@@ -1,10 +1,13 @@
 package com.youlai.system.model.query;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.youlai.system.common.base.BasePageQuery;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 数据表分页查询对象
  *
@@ -19,4 +22,10 @@ public class TablePageQuery extends BasePageQuery {
     @Schema(description="关键字(表名)")
     private String keywords;
 
+    /**
+     * 排除的表名
+     */
+    @JsonIgnore
+    private List<String> excludeTables;
+
 }