Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-07 d1d6771a32edca40f88a800459442279c00f6867

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

@@ -26,5 +26,5 @@

    IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);

    List<User> selectUser();
    List<Map> selectUser();
}