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

yuan

2026-05-20 d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1

 src/main/java/com/ruoyi/projectManagement/service/RolesService.java

@@ -4,7 +4,12 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.projectManagement.pojo.Roles;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.projectManagement.vo.SimpleRoleVo;

import java.util.List;

public interface RolesService extends IService<Roles> {
    IPage<Roles> listPage(Page<Roles> page, Roles roles);

    List<SimpleRoleVo> listSimpleRole();
}