Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2 天以前 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

 src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java

@@ -155,5 +155,10 @@


    List<Long> getUserByRole(@Param("role") String role);



    /**

     * 查询所有活跃用户（含部门名称和角色名称）

     */

    List<SysUser> selectUserListWithDetail();



    List<Long> getUserByPerms(@Param("perms") List<String> perms);

}