Merge remote-tracking branch 'origin/master'

zss

2024-06-07 49cc211213ce71bd6e5bb8eeeffbda46c0bf98d8

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

@@ -16,7 +16,11 @@

    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);

}