diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
index 0063ccdf..12bf49df 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -13,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.ruoyi.common.core.web.domain.BaseEntity;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -26,7 +27,7 @@ import java.util.Map;
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("sys_notice")
-public class SysNotice extends BaseEntity {
+public class SysNotice  implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
index b36bd15a..0f920c52 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
@@ -18,7 +18,7 @@ public interface SysConfigMapper extends BaseMapper<SysConfig>
      * @param config 参数配置信息
      * @return 参数配置信息
      */
-    public SysConfig selectConfig(SysConfig config);
+    SysConfig selectConfig(SysConfig config);
 
     /**
      * 查询参数配置列表
@@ -26,7 +26,7 @@ public interface SysConfigMapper extends BaseMapper<SysConfig>
      * @param config 参数配置信息
      * @return 参数配置集合
      */
-    public List<SysConfig> selectConfigList(SysConfig config);
+    List<SysConfig> selectConfigList(SysConfig config);
 
     /**
      * 根据键名查询参数配置信息
@@ -34,7 +34,7 @@ public interface SysConfigMapper extends BaseMapper<SysConfig>
      * @param configKey 参数键名
      * @return 参数配置信息
      */
-    public SysConfig checkConfigKeyUnique(String configKey);
+    SysConfig checkConfigKeyUnique(String configKey);
 
     /**
      * 新增参数配置
@@ -42,7 +42,7 @@ public interface SysConfigMapper extends BaseMapper<SysConfig>
      * @param config 参数配置信息
      * @return 结果
      */
-    public int insertConfig(SysConfig config);
+    int insertConfig(SysConfig config);
 
     /**
      * 修改参数配置
@@ -50,7 +50,7 @@ public interface SysConfigMapper extends BaseMapper<SysConfig>
      * @param config 参数配置信息
      * @return 结果
      */
-    public int updateConfig(SysConfig config);
+    int updateConfig(SysConfig config);
 
     /**
      * 删除参数配置
@@ -58,7 +58,7 @@ public interface SysConfigMapper extends BaseMapper<SysConfig>
      * @param configId 参数ID
      * @return 结果
      */
-    public int deleteConfigById(Long configId);
+    int deleteConfigById(Long configId);
 
     /**
      * 批量删除参数信息
@@ -66,5 +66,5 @@ public interface SysConfigMapper extends BaseMapper<SysConfig>
      * @param configIds 需要删除的参数ID
      * @return 结果
      */
-    public int deleteConfigByIds(Long[] configIds);
+    int deleteConfigByIds(Long[] configIds);
 }
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
index a0a3e86c..91add5fb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
@@ -21,7 +21,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param dept 部门信息
      * @return 部门信息集合
      */
-    public List<SysDept> selectDeptList(SysDept dept);
+    List<SysDept> selectDeptList(SysDept dept);
 
     /**
      * 根据角色ID查询部门树信息
@@ -30,7 +30,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param deptCheckStrictly 部门树选择项是否关联显示
      * @return 选中部门列表
      */
-    public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
+    List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
     /**
      * 根据部门ID查询信息
@@ -38,7 +38,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param deptId 部门ID
      * @return 部门信息
      */
-    public SysDept selectDeptById(Long deptId);
+    SysDept selectDeptById(Long deptId);
 
     /**
      * 根据ID查询所有子部门
@@ -46,7 +46,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param deptId 部门ID
      * @return 部门列表
      */
-    public List<SysDept> selectChildrenDeptById(Long deptId);
+    List<SysDept> selectChildrenDeptById(Long deptId);
 
     /**
      * 根据ID查询所有子部门（正常状态）
@@ -54,7 +54,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param deptId 部门ID
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById(Long deptId);
+    int selectNormalChildrenDeptById(Long deptId);
 
     /**
      * 是否存在子节点
@@ -62,7 +62,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param deptId 部门ID
      * @return 结果
      */
-    public int hasChildByDeptId(Long deptId);
+    int hasChildByDeptId(Long deptId);
 
     /**
      * 查询部门是否存在用户
@@ -70,7 +70,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param deptId 部门ID
      * @return 结果
      */
-    public int checkDeptExistUser(Long deptId);
+    int checkDeptExistUser(Long deptId);
 
     /**
      * 校验部门名称是否唯一
@@ -79,7 +79,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param parentId 父部门ID
      * @return 结果
      */
-    public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
+    SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
 
     /**
      * 新增部门信息
@@ -87,7 +87,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param dept 部门信息
      * @return 结果
      */
-    public int insertDept(SysDept dept);
+    int insertDept(SysDept dept);
 
     /**
      * 修改部门信息
@@ -95,14 +95,14 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param dept 部门信息
      * @return 结果
      */
-    public int updateDept(SysDept dept);
+    int updateDept(SysDept dept);
 
     /**
      * 修改所在部门的父级部门状态
      * 
      * @param dept 部门
      */
-    public void updateDeptStatus(SysDept dept);
+    void updateDeptStatus(SysDept dept);
 
     /**
      * 修改子元素关系
@@ -110,7 +110,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param depts 子元素
      * @return 结果
      */
-    public int updateDeptChildren(@Param("depts") List<SysDept> depts);
+    int updateDeptChildren(@Param("depts") List<SysDept> depts);
 
     /**
      * 删除部门管理信息
@@ -118,5 +118,5 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      * @param deptId 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+    int deleteDeptById(Long deptId);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
index b2794114..b670fdf3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
@@ -21,7 +21,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
      * @param dictData 字典数据信息
      * @return 字典数据集合信息
      */
-    public List<SysDictData> selectDictDataList(SysDictData dictData);
+    List<SysDictData> selectDictDataList(SysDictData dictData);
 
     /**
      * 根据字典类型查询字典数据
@@ -29,7 +29,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
      * @param dictType 字典类型
      * @return 字典数据集合信息
      */
-    public List<SysDictData> selectDictDataByType(String dictType);
+    List<SysDictData> selectDictDataByType(String dictType);
 
     /**
      * 根据字典类型和字典键值查询字典数据信息
@@ -38,7 +38,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
      * @param dictValue 字典键值
      * @return 字典标签
      */
-    public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
+    String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
 
     /**
      * 根据字典数据ID查询信息
@@ -46,7 +46,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
      * @param dictCode 字典数据ID
      * @return 字典数据
      */
-    public SysDictData selectDictDataById(Long dictCode);
+    SysDictData selectDictDataById(Long dictCode);
 
     /**
      * 查询字典数据
@@ -54,7 +54,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
      * @param dictType 字典类型
      * @return 字典数据
      */
-    public int countDictDataByType(String dictType);
+    int countDictDataByType(String dictType);
 
     /**
      * 通过字典ID删除字典数据信息
@@ -62,7 +62,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
      * @param dictCode 字典数据ID
      * @return 结果
      */
-    public int deleteDictDataById(Long dictCode);
+    int deleteDictDataById(Long dictCode);
 
     /**
      * 批量删除字典数据信息
@@ -70,7 +70,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
      * @param dictCodes 需要删除的字典数据ID
      * @return 结果
      */
-    public int deleteDictDataByIds(Long[] dictCodes);
+    int deleteDictDataByIds(Long[] dictCodes);
 
     /**
      * 新增字典数据信息
@@ -78,7 +78,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
      * @param dictData 字典数据信息
      * @return 结果
      */
-    public int insertDictData(SysDictData dictData);
+    int insertDictData(SysDictData dictData);
 
     /**
      * 修改字典数据信息
@@ -86,7 +86,7 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
      * @param dictData 字典数据信息
      * @return 结果
      */
-    public int updateDictData(SysDictData dictData);
+    int updateDictData(SysDictData dictData);
 
     /**
      * 同步修改字典类型
@@ -95,5 +95,5 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
      * @param newDictType 新旧字典类型
      * @return 结果
      */
-    public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
+    int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
index 9b62dc22..c840899d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
@@ -18,72 +18,72 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType>
 {
     /**
      * 根据条件分页查询字典类型
-     * 
+     *
      * @param dictType 字典类型信息
      * @return 字典类型集合信息
      */
-    public List<SysDictType> selectDictTypeList(SysDictType dictType);
+    List<SysDictType> selectDictTypeList(SysDictType dictType);
 
     /**
      * 根据所有字典类型
-     * 
+     *
      * @return 字典类型集合信息
      */
-    public List<SysDictType> selectDictTypeAll();
+    List<SysDictType> selectDictTypeAll();
 
     /**
      * 根据字典类型ID查询信息
-     * 
+     *
      * @param dictId 字典类型ID
      * @return 字典类型
      */
-    public SysDictType selectDictTypeById(Long dictId);
+    SysDictType selectDictTypeById(Long dictId);
 
     /**
      * 根据字典类型查询信息
-     * 
+     *
      * @param dictType 字典类型
      * @return 字典类型
      */
-    public SysDictType selectDictTypeByType(String dictType);
+    SysDictType selectDictTypeByType(String dictType);
 
     /**
      * 通过字典ID删除字典信息
-     * 
+     *
      * @param dictId 字典ID
      * @return 结果
      */
-    public int deleteDictTypeById(Long dictId);
+    int deleteDictTypeById(Long dictId);
 
     /**
      * 批量删除字典类型信息
-     * 
+     *
      * @param dictIds 需要删除的字典ID
      * @return 结果
      */
-    public int deleteDictTypeByIds(Long[] dictIds);
+    int deleteDictTypeByIds(Long[] dictIds);
 
     /**
      * 新增字典类型信息
-     * 
+     *
      * @param dictType 字典类型信息
      * @return 结果
      */
-    public int insertDictType(SysDictType dictType);
+    int insertDictType(SysDictType dictType);
 
     /**
      * 修改字典类型信息
-     * 
+     *
      * @param dictType 字典类型信息
      * @return 结果
      */
-    public int updateDictType(SysDictType dictType);
+    int updateDictType(SysDictType dictType);
 
     /**
      * 校验字典类型称是否唯一
-     * 
+     *
      * @param dictType 字典类型
      * @return 结果
      */
-    public SysDictType checkDictTypeUnique(String dictType);
+    SysDictType checkDictTypeUnique(String dictType);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
index 18ef17f5..90f1e049 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
@@ -18,7 +18,7 @@ public interface SysLogininforMapper extends BaseMapper<SysLogininfor>
      * 
      * @param logininfor 访问日志对象
      */
-    public int insertLogininfor(SysLogininfor logininfor);
+    int insertLogininfor(SysLogininfor logininfor);
 
     /**
      * 查询系统登录日志集合
@@ -26,7 +26,7 @@ public interface SysLogininforMapper extends BaseMapper<SysLogininfor>
      * @param logininfor 访问日志对象
      * @return 登录记录集合
      */
-    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
+    List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
 
     /**
      * 批量删除系统登录日志
@@ -34,12 +34,12 @@ public interface SysLogininforMapper extends BaseMapper<SysLogininfor>
      * @param infoIds 需要删除的登录日志ID
      * @return 结果
      */
-    public int deleteLogininforByIds(Long[] infoIds);
+    int deleteLogininforByIds(Long[] infoIds);
 
     /**
      * 清空系统登录日志
      * 
      * @return 结果
      */
-    public int cleanLogininfor();
+    int cleanLogininfor();
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
index 5b3aa1e0..85aa9837 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
@@ -21,14 +21,14 @@ public interface SysMenuMapper extends BaseMapper<SysMenu>
      * @param menu 菜单信息
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList(SysMenu menu);
+    List<SysMenu> selectMenuList(SysMenu menu);
 
     /**
      * 根据用户所有权限
      * 
      * @return 权限列表
      */
-    public List<String> selectMenuPerms();
+    List<String> selectMenuPerms();
 
     /**
      * 根据用户查询系统菜单列表
@@ -36,7 +36,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu>
      * @param menu 菜单信息
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuListByUserId(SysMenu menu);
+    List<SysMenu> selectMenuListByUserId(SysMenu menu);
 
     /**
      * 根据用户ID查询权限
@@ -44,14 +44,14 @@ public interface SysMenuMapper extends BaseMapper<SysMenu>
      * @param userId 用户ID
      * @return 权限列表
      */
-    public List<String> selectMenuPermsByUserId(Long userId);
+    List<String> selectMenuPermsByUserId(Long userId);
 
     /**
      * 根据用户ID查询菜单
      * 
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeAll();
+    List<SysMenu> selectMenuTreeAll();
 
     /**
      * 根据用户ID查询菜单
@@ -59,7 +59,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu>
      * @param username 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    List<SysMenu> selectMenuTreeByUserId(Long userId);
 
     /**
      * 根据角色ID查询菜单树信息
@@ -68,7 +68,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu>
      * @param menuCheckStrictly 菜单树选择项是否关联显示
      * @return 选中菜单列表
      */
-    public List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
+    List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
 
     /**
      * 根据菜单ID查询信息
@@ -76,7 +76,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu>
      * @param menuId 菜单ID
      * @return 菜单信息
      */
-    public SysMenu selectMenuById(Long menuId);
+    SysMenu selectMenuById(Long menuId);
 
     /**
      * 是否存在菜单子节点
@@ -84,7 +84,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu>
      * @param menuId 菜单ID
      * @return 结果
      */
-    public int hasChildByMenuId(Long menuId);
+    int hasChildByMenuId(Long menuId);
 
     /**
      * 新增菜单信息
@@ -92,7 +92,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu>
      * @param menu 菜单信息
      * @return 结果
      */
-    public int insertMenu(SysMenu menu);
+    int insertMenu(SysMenu menu);
 
     /**
      * 修改菜单信息
@@ -100,7 +100,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu>
      * @param menu 菜单信息
      * @return 结果
      */
-    public int updateMenu(SysMenu menu);
+    int updateMenu(SysMenu menu);
 
     /**
      * 删除菜单管理信息
@@ -108,7 +108,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu>
      * @param menuId 菜单ID
      * @return 结果
      */
-    public int deleteMenuById(Long menuId);
+    int deleteMenuById(Long menuId);
 
     /**
      * 校验菜单名称是否唯一
@@ -117,5 +117,5 @@ public interface SysMenuMapper extends BaseMapper<SysMenu>
      * @param parentId 父菜单ID
      * @return 结果
      */
-    public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
+    SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
index 5736649a..fa6c7f8c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
@@ -19,7 +19,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice>
      * @param noticeId 公告ID
      * @return 公告信息
      */
-    public SysNotice selectNoticeById(Long noticeId);
+    SysNotice selectNoticeById(Long noticeId);
 
     /**
      * 查询公告列表
@@ -27,7 +27,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice>
      * @param notice 公告信息
      * @return 公告集合
      */
-    public List<SysNotice> selectNoticeList(SysNotice notice);
+    List<SysNotice> selectNoticeList(SysNotice notice);
 
     /**
      * 新增公告
@@ -35,7 +35,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice>
      * @param notice 公告信息
      * @return 结果
      */
-    public int insertNotice(SysNotice notice);
+    int insertNotice(SysNotice notice);
 
     /**
      * 修改公告
@@ -43,7 +43,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice>
      * @param notice 公告信息
      * @return 结果
      */
-    public int updateNotice(SysNotice notice);
+    int updateNotice(SysNotice notice);
 
     /**
      * 批量删除公告
@@ -51,7 +51,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice>
      * @param noticeId 公告ID
      * @return 结果
      */
-    public int deleteNoticeById(Long noticeId);
+    int deleteNoticeById(Long noticeId);
 
     /**
      * 批量删除公告信息
@@ -59,5 +59,5 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice>
      * @param noticeIds 需要删除的公告ID
      * @return 结果
      */
-    public int deleteNoticeByIds(Long[] noticeIds);
+    int deleteNoticeByIds(Long[] noticeIds);
 }
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
index 02db6f09..4a59b17d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
@@ -18,7 +18,7 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog>
      * 
      * @param operLog 操作日志对象
      */
-    public int insertOperlog(SysOperLog operLog);
+    int insertOperlog(SysOperLog operLog);
 
     /**
      * 查询系统操作日志集合
@@ -26,7 +26,7 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog>
      * @param operLog 操作日志对象
      * @return 操作日志集合
      */
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
+    List<SysOperLog> selectOperLogList(SysOperLog operLog);
 
     /**
      * 批量删除系统操作日志
@@ -34,7 +34,7 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog>
      * @param operIds 需要删除的操作日志ID
      * @return 结果
      */
-    public int deleteOperLogByIds(Long[] operIds);
+    int deleteOperLogByIds(Long[] operIds);
 
     /**
      * 查询操作日志详细
@@ -42,10 +42,10 @@ public interface SysOperLogMapper extends BaseMapper<SysOperLog>
      * @param operId 操作ID
      * @return 操作日志对象
      */
-    public SysOperLog selectOperLogById(Long operId);
+    SysOperLog selectOperLogById(Long operId);
 
     /**
      * 清空操作日志
      */
-    public void cleanOperLog();
+    void cleanOperLog();
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
index fc4d81ce..2808fcb0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
@@ -19,14 +19,14 @@ public interface SysPostMapper extends BaseMapper<SysPost>
      * @param post 岗位信息
      * @return 岗位数据集合
      */
-    public List<SysPost> selectPostList(SysPost post);
+    List<SysPost> selectPostList(SysPost post);
 
     /**
      * 查询所有岗位
      * 
      * @return 岗位列表
      */
-    public List<SysPost> selectPostAll();
+    List<SysPost> selectPostAll();
 
     /**
      * 通过岗位ID查询岗位信息
@@ -34,7 +34,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
      * @param postId 岗位ID
      * @return 角色对象信息
      */
-    public SysPost selectPostById(Long postId);
+    SysPost selectPostById(Long postId);
 
     /**
      * 根据用户ID获取岗位选择框列表
@@ -42,7 +42,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Integer> selectPostListByUserId(Long userId);
+    List<Integer> selectPostListByUserId(Long userId);
 
     /**
      * 查询用户所属岗位组
@@ -50,7 +50,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
      * @param userName 用户名
      * @return 结果
      */
-    public List<SysPost> selectPostsByUserName(String userName);
+    List<SysPost> selectPostsByUserName(String userName);
 
     /**
      * 删除岗位信息
@@ -58,7 +58,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
      * @param postId 岗位ID
      * @return 结果
      */
-    public int deletePostById(Long postId);
+    int deletePostById(Long postId);
 
     /**
      * 批量删除岗位信息
@@ -66,7 +66,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
      * @param postIds 需要删除的岗位ID
      * @return 结果
      */
-    public int deletePostByIds(Long[] postIds);
+    int deletePostByIds(Long[] postIds);
 
     /**
      * 修改岗位信息
@@ -74,7 +74,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
      * @param post 岗位信息
      * @return 结果
      */
-    public int updatePost(SysPost post);
+    int updatePost(SysPost post);
 
     /**
      * 新增岗位信息
@@ -82,7 +82,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
      * @param post 岗位信息
      * @return 结果
      */
-    public int insertPost(SysPost post);
+    int insertPost(SysPost post);
 
     /**
      * 校验岗位名称
@@ -90,7 +90,7 @@ public interface SysPostMapper extends BaseMapper<SysPost>
      * @param postName 岗位名称
      * @return 结果
      */
-    public SysPost checkPostNameUnique(String postName);
+    SysPost checkPostNameUnique(String postName);
 
     /**
      * 校验岗位编码
@@ -98,5 +98,5 @@ public interface SysPostMapper extends BaseMapper<SysPost>
      * @param postCode 岗位编码
      * @return 结果
      */
-    public SysPost checkPostCodeUnique(String postCode);
+    SysPost checkPostCodeUnique(String postCode);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
index 4e67b208..a21e889d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
@@ -19,7 +19,7 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept>
      * @param roleId 角色ID
      * @return 结果
      */
-    public int deleteRoleDeptByRoleId(Long roleId);
+    int deleteRoleDeptByRoleId(Long roleId);
 
     /**
      * 批量删除角色部门关联信息
@@ -27,7 +27,7 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept>
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteRoleDept(Long[] ids);
+    int deleteRoleDept(Long[] ids);
 
     /**
      * 查询部门使用数量
@@ -35,7 +35,7 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept>
      * @param deptId 部门ID
      * @return 结果
      */
-    public int selectCountRoleDeptByDeptId(Long deptId);
+    int selectCountRoleDeptByDeptId(Long deptId);
 
     /**
      * 批量新增角色部门信息
@@ -43,5 +43,5 @@ public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept>
      * @param roleDeptList 角色部门列表
      * @return 结果
      */
-    public int batchRoleDept(List<SysRoleDept> roleDeptList);
+    int batchRoleDept(List<SysRoleDept> roleDeptList);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
index e348a45d..eed3c717 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
@@ -19,7 +19,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @param role 角色信息
      * @return 角色数据集合信息
      */
-    public List<SysRole> selectRoleList(SysRole role);
+    List<SysRole> selectRoleList(SysRole role);
 
     /**
      * 根据用户ID查询角色
@@ -27,14 +27,14 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @param userId 用户ID
      * @return 角色列表
      */
-    public List<SysRole> selectRolePermissionByUserId(Long userId);
+    List<SysRole> selectRolePermissionByUserId(Long userId);
 
     /**
      * 查询所有角色
      * 
      * @return 角色列表
      */
-    public List<SysRole> selectRoleAll();
+    List<SysRole> selectRoleAll();
 
     /**
      * 根据用户ID获取角色选择框列表
@@ -42,7 +42,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @param userId 用户ID
      * @return 选中角色ID列表
      */
-    public List<Integer> selectRoleListByUserId(Long userId);
+    List<Integer> selectRoleListByUserId(Long userId);
 
     /**
      * 通过角色ID查询角色
@@ -50,7 +50,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @param roleId 角色ID
      * @return 角色对象信息
      */
-    public SysRole selectRoleById(Long roleId);
+    SysRole selectRoleById(Long roleId);
 
     /**
      * 根据用户ID查询角色
@@ -58,7 +58,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @param userName 用户名
      * @return 角色列表
      */
-    public List<SysRole> selectRolesByUserName(String userName);
+    List<SysRole> selectRolesByUserName(String userName);
 
     /**
      * 校验角色名称是否唯一
@@ -66,7 +66,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @param roleName 角色名称
      * @return 角色信息
      */
-    public SysRole checkRoleNameUnique(String roleName);
+    SysRole checkRoleNameUnique(String roleName);
 
     /**
      * 校验角色权限是否唯一
@@ -74,7 +74,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @param roleKey 角色权限
      * @return 角色信息
      */
-    public SysRole checkRoleKeyUnique(String roleKey);
+    SysRole checkRoleKeyUnique(String roleKey);
 
     /**
      * 修改角色信息
@@ -82,7 +82,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @param role 角色信息
      * @return 结果
      */
-    public int updateRole(SysRole role);
+    int updateRole(SysRole role);
 
     /**
      * 新增角色信息
@@ -90,7 +90,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @param role 角色信息
      * @return 结果
      */
-    public int insertRole(SysRole role);
+    int insertRole(SysRole role);
 
     /**
      * 通过角色ID删除角色
@@ -98,7 +98,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @param roleId 角色ID
      * @return 结果
      */
-    public int deleteRoleById(Long roleId);
+    int deleteRoleById(Long roleId);
 
     /**
      * 批量删除角色信息
@@ -106,5 +106,5 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @param roleIds 需要删除的角色ID
      * @return 结果
      */
-    public int deleteRoleByIds(Long[] roleIds);
+    int deleteRoleByIds(Long[] roleIds);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
index 3765f366..1e5449f9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
@@ -19,7 +19,7 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu>
      * @param menuId 菜单ID
      * @return 结果
      */
-    public int checkMenuExistRole(Long menuId);
+    int checkMenuExistRole(Long menuId);
 
     /**
      * 通过角色ID删除角色和菜单关联
@@ -27,7 +27,7 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu>
      * @param roleId 角色ID
      * @return 结果
      */
-    public int deleteRoleMenuByRoleId(Long roleId);
+    int deleteRoleMenuByRoleId(Long roleId);
 
     /**
      * 批量删除角色菜单关联信息
@@ -35,7 +35,7 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu>
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteRoleMenu(Long[] ids);
+    int deleteRoleMenu(Long[] ids);
 
     /**
      * 批量新增角色菜单信息
@@ -43,5 +43,5 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu>
      * @param roleMenuList 角色菜单列表
      * @return 结果
      */
-    public int batchRoleMenu(List<SysRoleMenu> roleMenuList);
+    int batchRoleMenu(List<SysRoleMenu> roleMenuList);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index fdeb954e..873d19a7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -21,7 +21,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param sysUser 用户信息
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectUserList(SysUser sysUser);
+    List<SysUser> selectUserList(SysUser sysUser);
 
     /**
      * 通过用户名查询用户
@@ -29,7 +29,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param userName 用户名
      * @return 用户对象信息
      */
-    public SysUser selectUserByUserName(String userName);
+    SysUser selectUserByUserName(String userName);
 
     /**
      * 通过用户ID查询用户
@@ -37,7 +37,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param userId 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    SysUser selectUserById(Long userId);
 
     /**
      * 新增用户信息
@@ -45,7 +45,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param user 用户信息
      * @return 结果
      */
-    public int insertUser(SysUser user);
+    int insertUser(SysUser user);
 
     /**
      * 修改用户信息
@@ -53,7 +53,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param user 用户信息
      * @return 结果
      */
-    public int updateUser(SysUser user);
+    int updateUser(SysUser user);
 
     /**
      * 修改用户头像
@@ -62,7 +62,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param avatar 头像地址
      * @return 结果
      */
-    public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
+    int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
 
     /**
      * 重置用户密码
@@ -71,7 +71,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param password 密码
      * @return 结果
      */
-    public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
+    int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
 
     /**
      * 通过用户ID删除用户
@@ -79,7 +79,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    int deleteUserById(Long userId);
 
     /**
      * 批量删除用户信息
@@ -87,7 +87,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
-    public int deleteUserByIds(Long[] userIds);
+    int deleteUserByIds(Long[] userIds);
 
     /**
      * 校验用户名称是否唯一
@@ -95,7 +95,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param userName 用户名称
      * @return 结果
      */
-    public int checkUserNameUnique(String userName);
+    int checkUserNameUnique(String userName);
 
     /**
      * 校验手机号码是否唯一
@@ -103,7 +103,7 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param phonenumber 手机号码
      * @return 结果
      */
-    public SysUser checkPhoneUnique(String phonenumber);
+    SysUser checkPhoneUnique(String phonenumber);
 
     /**
      * 校验email是否唯一
@@ -111,5 +111,5 @@ public interface SysUserMapper extends BaseMapper<SysUser>
      * @param email 用户邮箱
      * @return 结果
      */
-    public SysUser checkEmailUnique(String email);
+    SysUser checkEmailUnique(String email);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
index ac785ce4..dd034971 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
@@ -19,7 +19,7 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost>
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserPostByUserId(Long userId);
+    int deleteUserPostByUserId(Long userId);
 
     /**
      * 通过岗位ID查询岗位使用数量
@@ -27,7 +27,7 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost>
      * @param postId 岗位ID
      * @return 结果
      */
-    public int countUserPostById(Long postId);
+    int countUserPostById(Long postId);
 
     /**
      * 批量删除用户和岗位关联
@@ -35,7 +35,7 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost>
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteUserPost(Long[] ids);
+    int deleteUserPost(Long[] ids);
 
     /**
      * 批量新增用户岗位信息
@@ -43,5 +43,5 @@ public interface SysUserPostMapper extends BaseMapper<SysUserPost>
      * @param userPostList 用户角色列表
      * @return 结果
      */
-    public int batchUserPost(List<SysUserPost> userPostList);
+    int batchUserPost(List<SysUserPost> userPostList);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
index ad8acb3f..9af82908 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
@@ -21,7 +21,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole>
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserRoleByUserId(Long userId);
+    int deleteUserRoleByUserId(Long userId);
 
     /**
      * 批量删除用户和角色关联
@@ -29,7 +29,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole>
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteUserRole(Long[] ids);
+    int deleteUserRole(Long[] ids);
 
     /**
      * 通过角色ID查询角色使用数量
@@ -37,7 +37,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole>
      * @param roleId 角色ID
      * @return 结果
      */
-    public int countUserRoleByRoleId(Long roleId);
+    int countUserRoleByRoleId(Long roleId);
 
     /**
      * 批量新增用户角色信息
@@ -45,7 +45,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole>
      * @param userRoleList 用户角色列表
      * @return 结果
      */
-    public int batchUserRole(List<SysUserRole> userRoleList);
+    int batchUserRole(List<SysUserRole> userRoleList);
 
     /**
      * 删除用户和角色关联信息
@@ -53,7 +53,7 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole>
      * @param userRole 用户和角色关联信息
      * @return 结果
      */
-    public int deleteUserRoleInfo(SysUserRole userRole);
+    int deleteUserRoleInfo(SysUserRole userRole);
 
     /**
      * 批量取消授权用户角色
@@ -62,5 +62,5 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole>
      * @param userIds 需要删除的用户数据ID
      * @return 结果
      */
-    public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+    int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index bf07ff5b..ac66252f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE r.del_flag = '0' and ur.user_id = #{userId}
 	</select>
 	
-	<select id="selectRoleAll" resultMap="SysRoleResult">
+	<select id="selectRoleAll" resultType="SysRole">
 		<include refid="selectRoleVo"/>
 	</select>