Merge remote-tracking branch 'origin/master'

zss

2024-08-07 55d7987024ec302f27b58d75c6788ff8e04df636

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

@@ -21,4 +21,7 @@
    //获取设备负责人
    List<User> getDeviceManager();

    User getCustom(Integer userId);

    List<User> getUser();
}