Merge remote-tracking branch 'origin/master'

无关风月

昨天 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -234,4 +234,7 @@
    public int editRole(SysRoleDTO dto);

    List<SysRole> selectRoleByUserIds(List<String> roleIds);

    List<SysRole> listNotPageByTemplateId(String templateId);

}