fix: 合并develop问题修复

src/main/java/com/youlai/system/mapper/GenConfigMapper.java

@@ -0,0 +1,20 @@
+package com.youlai.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.youlai.system.model.entity.GenConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 代码生成基础配置访问层
+ *
+ * @author Ray
+ * @since 2.10.0
+ */
+@Mapper
+public interface GenConfigMapper extends BaseMapper<GenConfig> {
+
+}
+
+
+
+

src/main/java/com/youlai/system/mapper/GenFieldConfigMapper.java

@@ -0,0 +1,20 @@
+package com.youlai.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.youlai.system.model.entity.GenFieldConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 代码生成字段配置访问层
+ *
+ * @author Ray
+ * @since 2.10.0
+ */
+@Mapper
+public interface GenFieldConfigMapper extends BaseMapper<GenFieldConfig> {
+
+}
+
+
+
+

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/service/impl/GenConfigServiceImpl.java

@@ -1,5 +1,6 @@
 package com.youlai.system.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.system.mapper.GenConfigMapper;
 import com.youlai.system.model.entity.GenConfig;
 import com.youlai.system.service.GenConfigService;