Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

2026-05-21 88dc4c9004c0a19ee7797e6fcd74b96efaffca0a

 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;



/**