diff --git a/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml b/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml
index 3caf98a71..26f86bdb2 100644
--- a/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml
+++ b/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml
@@ -4,23 +4,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.demo.mapper.TestDemoMapper">
 
-    <resultMap type="com.ruoyi.demo.domain.TestDemo" id="TestDemoResult">
-        <result property="id" column="id"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="userId" column="user_id"/>
-        <result property="orderNum" column="order_num"/>
-        <result property="testKey" column="test_key"/>
-        <result property="value" column="value"/>
-        <result property="version" column="version"/>
-        <result property="createTime" column="create_time"/>
-        <result property="createBy" column="create_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="delFlag" column="del_flag"/>
-    </resultMap>
     <select id="customPageList" resultType="com.ruoyi.demo.domain.vo.TestDemoVo">
         SELECT * FROM test_demo ${ew.customSqlSegment}
     </select>
 
-
 </mapper>
diff --git a/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml b/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml
index 0943d5b14..77b4d93b2 100644
--- a/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml
+++ b/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml
@@ -4,19 +4,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.demo.mapper.TestTreeMapper">
 
-    <resultMap type="com.ruoyi.demo.domain.TestTree" id="TestTreeResult">
-        <result property="id" column="id"/>
-        <result property="parentId" column="parent_id"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="userId" column="user_id"/>
-        <result property="treeName" column="tree_name"/>
-        <result property="version" column="version"/>
-        <result property="createTime" column="create_time"/>
-        <result property="createBy" column="create_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="delFlag" column="del_flag"/>
-    </resultMap>
-
-
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index fc44d8cbc..8d6f06466 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -4,29 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.generator.mapper.GenTableColumnMapper">
 
-    <resultMap type="GenTableColumn" id="GenTableColumnResult">
-        <id     property="columnId"       column="column_id"      />
-        <result property="tableId"        column="table_id"       />
-        <result property="columnName"     column="column_name"    />
-        <result property="columnComment"  column="column_comment" />
-        <result property="columnType"     column="column_type"    />
-        <result property="javaType"       column="java_type"      />
-        <result property="javaField"      column="java_field"     />
-        <result property="isPk"           column="is_pk"          />
-        <result property="isIncrement"    column="is_increment"   />
-        <result property="isRequired"     column="is_required"    />
-        <result property="isInsert"       column="is_insert"      />
-        <result property="isEdit"         column="is_edit"        />
-        <result property="isList"         column="is_list"        />
-        <result property="isQuery"        column="is_query"       />
-        <result property="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="dictType"       column="dict_type"      />
-        <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
-        <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
-        <result property="updateTime"     column="update_time"    />
+    <resultMap type="com.ruoyi.generator.domain.GenTableColumn" id="GenTableColumnResult">
     </resultMap>
 
     <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 2f17694b4..21bd26b89 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.generator.mapper.GenTableMapper">
 
-    <resultMap type="GenTable" id="GenTableResult">
+    <resultMap type="com.ruoyi.generator.domain.GenTable" id="GenTableResult">
         <id     property="tableId"        column="table_id"          />
         <result property="tableName"      column="table_name"        />
         <result property="tableComment"   column="table_comment"     />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
     </resultMap>
 
-    <resultMap type="GenTableColumn" id="GenTableColumnResult">
+    <resultMap type="com.ruoyi.generator.domain.GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index 983125b60..766724e77 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -4,16 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
 
-    <resultMap type="SysConfig" id="SysConfigResult">
-        <id property="configId" column="config_id"/>
-        <result property="configName" column="config_name"/>
-        <result property="configKey" column="config_key"/>
-        <result property="configValue" column="config_value"/>
-        <result property="configType" column="config_type"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 00493be9e..9f9c0bc1b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -4,22 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
 
-    <resultMap type="SysDept" id="SysDeptResult">
-        <id property="deptId" column="dept_id"/>
-        <result property="parentId" column="parent_id"/>
-        <result property="ancestors" column="ancestors"/>
-        <result property="deptName" column="dept_name"/>
-        <result property="orderNum" column="order_num"/>
-        <result property="leader" column="leader"/>
-        <result property="phone" column="phone"/>
-        <result property="email" column="email"/>
-        <result property="status" column="status"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="parentName" column="parent_name"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
+    <resultMap type="com.ruoyi.common.core.domain.entity.SysDept" id="SysDeptResult">
     </resultMap>
 
     <select id="selectDeptList" resultMap="SysDeptResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index f17d59377..1ebfad7af 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -4,20 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper">
 
-    <resultMap type="SysDictData" id="SysDictDataResult">
-        <id property="dictCode" column="dict_code"/>
-        <result property="dictSort" column="dict_sort"/>
-        <result property="dictLabel" column="dict_label"/>
-        <result property="dictValue" column="dict_value"/>
-        <result property="dictType" column="dict_type"/>
-        <result property="cssClass" column="css_class"/>
-        <result property="listClass" column="list_class"/>
-        <result property="isDefault" column="is_default"/>
-        <result property="status" column="status"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-</mapper> 
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 8857f3498..42b040532 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -4,15 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
 
-    <resultMap type="SysDictType" id="SysDictTypeResult">
-        <id property="dictId" column="dict_id"/>
-        <result property="dictName" column="dict_name"/>
-        <result property="dictType" column="dict_type"/>
-        <result property="status" column="status"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-</mapper> 
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
index a2e38bfbf..65ea938a7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -4,16 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper">
 
-    <resultMap type="SysLogininfor" id="SysLogininforResult">
-        <id property="infoId" column="info_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="status" column="status"/>
-        <result property="ipaddr" column="ipaddr"/>
-        <result property="loginLocation" column="login_location"/>
-        <result property="browser" column="browser"/>
-        <result property="os" column="os"/>
-        <result property="msg" column="msg"/>
-        <result property="loginTime" column="login_time"/>
-    </resultMap>
-
-</mapper> 
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index d308d8d0b..5983514bf 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -4,30 +4,10 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
 
-    <resultMap type="SysMenu" id="SysMenuResult">
-        <id property="menuId" column="menu_id"/>
-        <result property="menuName" column="menu_name"/>
-        <result property="parentName" column="parent_name"/>
-        <result property="parentId" column="parent_id"/>
-        <result property="orderNum" column="order_num"/>
-        <result property="path" column="path"/>
-        <result property="component" column="component"/>
-        <result property="queryParam" column="query_param"/>
-        <result property="isFrame" column="is_frame"/>
-        <result property="isCache" column="is_cache"/>
-        <result property="menuType" column="menu_type"/>
-        <result property="visible" column="visible"/>
-        <result property="status" column="status"/>
-        <result property="perms" column="perms"/>
-        <result property="icon" column="icon"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="remark" column="remark"/>
+    <resultMap type="com.ruoyi.common.core.domain.entity.SysMenu" id="SysMenuResult">
     </resultMap>
 
-    <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
+    <select id="selectMenuListByUserId" resultMap="SysMenuResult">
         select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query_param, m.visible, m.status,
         m.perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
         from sys_menu m
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index be3cd0857..e7aeaf989 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -4,17 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper">
 
-    <resultMap type="SysNotice" id="SysNoticeResult">
-        <result property="noticeId" column="notice_id"/>
-        <result property="noticeTitle" column="notice_title"/>
-        <result property="noticeType" column="notice_type"/>
-        <result property="noticeContent" column="notice_content"/>
-        <result property="status" column="status"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
-    </resultMap>
-
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index 9d40c6d94..af7025954 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -4,23 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper">
 
-    <resultMap type="SysOperLog" id="SysOperLogResult">
-        <id property="operId" column="oper_id"/>
-        <result property="title" column="title"/>
-        <result property="businessType" column="business_type"/>
-        <result property="method" column="method"/>
-        <result property="requestMethod" column="request_method"/>
-        <result property="operatorType" column="operator_type"/>
-        <result property="operName" column="oper_name"/>
-        <result property="deptName" column="dept_name"/>
-        <result property="operUrl" column="oper_url"/>
-        <result property="operIp" column="oper_ip"/>
-        <result property="operLocation" column="oper_location"/>
-        <result property="operParam" column="oper_param"/>
-        <result property="jsonResult" column="json_result"/>
-        <result property="status" column="status"/>
-        <result property="errorMsg" column="error_msg"/>
-        <result property="operTime" column="oper_time"/>
-    </resultMap>
-
-</mapper> 
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml
index 77dc40e20..8af22fef6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml
@@ -4,24 +4,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysOssConfigMapper">
 
-    <resultMap type="com.ruoyi.system.domain.SysOssConfig" id="SysOssConfigResult">
-        <result property="ossConfigId" column="oss_config_id"/>
-        <result property="configKey" column="config_key"/>
-        <result property="accessKey" column="access_key"/>
-        <result property="secretKey" column="secret_key"/>
-        <result property="bucketName" column="bucket_name"/>
-        <result property="prefix" column="prefix"/>
-        <result property="endpoint" column="endpoint"/>
-        <result property="isHttps" column="is_https"/>
-        <result property="region" column="region"/>
-        <result property="status" column="status"/>
-        <result property="ext1" column="ext1"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
-    </resultMap>
-
-
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml
index a1e4ca8ad..24714f6a7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml
@@ -2,17 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysOssMapper">
 
-    <resultMap type="com.ruoyi.system.domain.SysOss" id="SysOssResult">
-        <result property="ossId" column="oss_id"/>
-        <result property="fileName" column="file_name"/>
-        <result property="fileSuffix" column="file_suffix"/>
-        <result property="url" column="url"/>
-        <result property="createTime" column="create_time"/>
-        <result property="createBy" column="create_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="service" column="service"/>
-    </resultMap>
-
-
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
index 3863f66da..614a99be0 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -4,17 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysPostMapper">
 
-    <resultMap type="SysPost" id="SysPostResult">
-        <id property="postId" column="post_id"/>
-        <result property="postCode" column="post_code"/>
-        <result property="postName" column="post_name"/>
-        <result property="postSort" column="post_sort"/>
-        <result property="status" column="status"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
+    <resultMap type="com.ruoyi.system.domain.SysPost" id="SysPostResult">
     </resultMap>
 
     <select id="selectPostListByUserId" parameterType="Long" resultType="Long">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
index e64cb4555..94740f424 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -4,9 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper">
 
-    <resultMap type="SysRoleDept" id="SysRoleDeptResult">
-        <result property="roleId" column="role_id"/>
-        <result property="deptId" column="dept_id"/>
-    </resultMap>
-
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 90dff5051..45e090a65 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -4,21 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
 
-    <resultMap type="SysRole" id="SysRoleResult">
-        <id property="roleId" column="role_id"/>
-        <result property="roleName" column="role_name"/>
-        <result property="roleKey" column="role_key"/>
-        <result property="roleSort" column="role_sort"/>
-        <result property="dataScope" column="data_scope"/>
-        <result property="menuCheckStrictly" column="menu_check_strictly"/>
-        <result property="deptCheckStrictly" column="dept_check_strictly"/>
-        <result property="status" column="status"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remark" column="remark"/>
+    <resultMap type="com.ruoyi.common.core.domain.entity.SysRole" id="SysRoleResult">
     </resultMap>
 
     <sql id="selectRoleVo">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
index efc5a791f..e40a242dc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -4,9 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper">
 
-    <resultMap type="SysRoleMenu" id="SysRoleMenuResult">
-        <result property="roleId" column="role_id"/>
-        <result property="menuId" column="menu_id"/>
-    </resultMap>
-
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index dacdcd8a6..f9ee5ab95 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
 
-    <resultMap type="SysUser" id="SysUserResult">
+    <resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
         <result property="deptId" column="dept_id"/>
         <result property="userName" column="user_name"/>
@@ -24,11 +24,11 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
-        <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
+        <association property="dept" column="dept_id" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
     </resultMap>
 
-    <resultMap id="deptResult" type="SysDept">
+    <resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
         <id property="deptId" column="dept_id"/>
         <result property="parentId" column="parent_id"/>
         <result property="deptName" column="dept_name"/>
@@ -38,7 +38,7 @@
         <result property="status" column="dept_status"/>
     </resultMap>
 
-    <resultMap id="RoleResult" type="SysRole">
+    <resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
         <id property="roleId" column="role_id"/>
         <result property="roleName" column="role_name"/>
         <result property="roleKey" column="role_key"/>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
index 0ff926556..d6dffcd18 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -4,9 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper">
 
-    <resultMap type="SysUserPost" id="SysUserPostResult">
-        <result property="userId" column="user_id"/>
-        <result property="postId" column="post_id"/>
-    </resultMap>
-
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
index 5a55fcb1e..a029d6658 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -4,10 +4,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
 
-    <resultMap type="SysUserRole" id="SysUserRoleResult">
-        <result property="userId" column="user_id"/>
-        <result property="roleId" column="role_id"/>
-    </resultMap>
     <select id="selectUserIdsByRoleId" resultType="Long">
         select u.user_id from sys_user u
         inner join sys_user_role sur