Merge remote-tracking branch 'origin/master'

zss

2024-07-18 4d7d9ee75f529c9e1d66f98608edf18221f76acd

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

}