diff --git a/mh-admin/pom.xml b/mh-admin/pom.xml
index b8f1a12..0de51ee 100644
--- a/mh-admin/pom.xml
+++ b/mh-admin/pom.xml
@@ -50,7 +50,7 @@
com.baomidou
- mybatis-plus-boot-starter
+ mybatis-plus-spring-boot3-starter
diff --git a/mh-common/pom.xml b/mh-common/pom.xml
index e4f3d0f..d9f74a9 100644
--- a/mh-common/pom.xml
+++ b/mh-common/pom.xml
@@ -124,6 +124,13 @@
3.5.9
compile
+
+ com.baomidou
+ mybatis-plus-core
+ 3.5.9
+ compile
+
+
diff --git a/mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java b/mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java
index f7bd251..da45ae8 100644
--- a/mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java
+++ b/mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java
@@ -5,6 +5,7 @@ import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import jakarta.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -24,7 +25,7 @@ public class SysUser extends BaseEntity
{
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "user_id", type = IdType.AUTO)
/** 用户ID */
@Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
private Long userId;
diff --git a/mh-system/src/main/java/com/mh/system/domain/SysConfig.java b/mh-system/src/main/java/com/mh/system/domain/SysConfig.java
index 52b4ffd..222e02a 100644
--- a/mh-system/src/main/java/com/mh/system/domain/SysConfig.java
+++ b/mh-system/src/main/java/com/mh/system/domain/SysConfig.java
@@ -1,5 +1,7 @@
package com.mh.system.domain;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -17,6 +19,7 @@ public class SysConfig extends BaseEntity
{
private static final long serialVersionUID = 1L;
+ @TableId(value = "config_id", type = IdType.AUTO)
/** 参数主键 */
@Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
private Long configId;
diff --git a/mh-system/src/main/java/com/mh/system/domain/SysLogininfor.java b/mh-system/src/main/java/com/mh/system/domain/SysLogininfor.java
index 2025048..0e70c7b 100644
--- a/mh-system/src/main/java/com/mh/system/domain/SysLogininfor.java
+++ b/mh-system/src/main/java/com/mh/system/domain/SysLogininfor.java
@@ -1,6 +1,9 @@
package com.mh.system.domain;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mh.common.annotation.Excel;
import com.mh.common.annotation.Excel.ColumnType;
@@ -15,6 +18,7 @@ public class SysLogininfor extends BaseEntity
{
private static final long serialVersionUID = 1L;
+ @TableId(type = IdType.AUTO)
/** ID */
@Excel(name = "序号", cellType = ColumnType.NUMERIC)
private Long infoId;
diff --git a/mh-system/src/main/java/com/mh/system/domain/SysNotice.java b/mh-system/src/main/java/com/mh/system/domain/SysNotice.java
index 5ffe59a..d3435ff 100644
--- a/mh-system/src/main/java/com/mh/system/domain/SysNotice.java
+++ b/mh-system/src/main/java/com/mh/system/domain/SysNotice.java
@@ -1,5 +1,7 @@
package com.mh.system.domain;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -16,6 +18,7 @@ public class SysNotice extends BaseEntity
{
private static final long serialVersionUID = 1L;
+ @TableId(value = "notice_id", type = IdType.AUTO)
/** 公告ID */
private Long noticeId;
diff --git a/mh-system/src/main/java/com/mh/system/domain/SysOperLog.java b/mh-system/src/main/java/com/mh/system/domain/SysOperLog.java
index 2939ca5..714ef78 100644
--- a/mh-system/src/main/java/com/mh/system/domain/SysOperLog.java
+++ b/mh-system/src/main/java/com/mh/system/domain/SysOperLog.java
@@ -1,6 +1,9 @@
package com.mh.system.domain;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mh.common.annotation.Excel;
import com.mh.common.annotation.Excel.ColumnType;
@@ -15,6 +18,7 @@ public class SysOperLog extends BaseEntity
{
private static final long serialVersionUID = 1L;
+ @TableId(value = "oper_id", type = IdType.AUTO)
/** 日志主键 */
@Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
private Long operId;
diff --git a/mh-system/src/main/java/com/mh/system/domain/SysPost.java b/mh-system/src/main/java/com/mh/system/domain/SysPost.java
index 09a85cf..ca26502 100644
--- a/mh-system/src/main/java/com/mh/system/domain/SysPost.java
+++ b/mh-system/src/main/java/com/mh/system/domain/SysPost.java
@@ -1,5 +1,7 @@
package com.mh.system.domain;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
@@ -18,6 +20,7 @@ public class SysPost extends BaseEntity
{
private static final long serialVersionUID = 1L;
+ @TableId(value = "post_id", type = IdType.AUTO)
/** 岗位序号 */
@Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
private Long postId;
diff --git a/mh-system/src/main/java/com/mh/system/mapper/SysUserMapper.java b/mh-system/src/main/java/com/mh/system/mapper/SysUserMapper.java
index 707bfd7..eb07c26 100644
--- a/mh-system/src/main/java/com/mh/system/mapper/SysUserMapper.java
+++ b/mh-system/src/main/java/com/mh/system/mapper/SysUserMapper.java
@@ -1,6 +1,8 @@
package com.mh.system.mapper;
import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.mh.common.core.domain.entity.SysUser;
@@ -9,7 +11,7 @@ import com.mh.common.core.domain.entity.SysUser;
*
* @author mh
*/
-public interface SysUserMapper
+public interface SysUserMapper extends BaseMapper
{
/**
* 根据条件分页查询用户列表
diff --git a/mh-system/src/main/resources/mapper/system/SysDeptMapper.xml b/mh-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 3d606b3..9ef9b04 100644
--- a/mh-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/mh-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -75,11 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"