Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro

yuan

2026-05-20 d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1

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

@@ -1,6 +1,8 @@
package com.ruoyi.project.system.mapper;



import java.util.List;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import com.ruoyi.project.system.domain.SysRole;



/**