Merge remote-tracking branch 'origin/master'

zss

2023-08-26 6984757bfc75b4a25014de1eb71c2aa75ebdb86f

 user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java

文件名从 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java 修改
@@ -3,6 +3,7 @@
import com.yuanchu.limslaboratory.pojo.dto.GetAllRoleAndMenuByConditionPageDto;
import com.yuanchu.limslaboratory.pojo.dto.RoleAndMenuDto;
import com.yuanchu.limslaboratory.pojo.dto.RoleInfoDto;
import com.yuanchu.limslaboratory.pojo.dto.UpdateRoleMenuDto;

import java.util.List;
import java.util.Map;
@@ -19,4 +20,10 @@
    boolean assertRepeat(String roleName);

    Map<String, Object> getAllRoleAndMenuInfo(GetAllRoleAndMenuByConditionPageDto dto);

    boolean deleteRole(Long id);

    boolean updateRoleMenu(UpdateRoleMenuDto dto);

    RoleAndMenuDto getRoleAndMenuByRole(Long roleId);
}