Merge remote-tracking branch 'origin/master'

zss

2024-08-12 2c00320ecf5745742b9dc9a960f506165e880727

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