Merge remote-tracking branch 'origin/master'

Crunchy

2024-08-09 bf233b9eeb959091831bf0b9a11a180fee2b2d51

 user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java

@@ -16,7 +16,12 @@

    IPage<User> selectUserDtoPageList(IPage<UserPageDto> page, QueryWrapper<UserPageDto> ew);

    IPage<User> selectPersonnelOverview(IPage<UserPageDto> page, QueryWrapper<UserPageDto> ew);

    //获取设备负责人
    List<User> getDeviceManager();

    User getCustom(Integer userId);

    List<User> getUser();
}