Merge remote-tracking branch 'origin/master' into xizang-changyun

yupeng

2025-02-07 c3ac3682cac1d5dc3f2310418502c1c96ffe5a7e

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java

@@ -125,6 +125,6 @@

    String selectByUserId(@Param("userId") Long user_id);

    List<SysRole> selectList(@Param("query")SysRoleQuery query,@Param("pageInfo") PageInfo<SysRole> pageInfo);
    List<SysRole> selectPageList(@Param("query")SysRoleQuery query,@Param("pageInfo") PageInfo<SysRole> pageInfo);

}