Merge remote-tracking branch 'origin/master'

zss

2023-08-22 da30df12fc02f28a4b016c8c35a3b57e5c29fe35

 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java

@@ -75,7 +75,7 @@
    }

    @Override
    public List<Map> selectUser() {
    public List<Map<String,Object>> selectUser() {
        return userMapper.selectUser();
    }