Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-19 3f0e25410f5aa3f01fda3d2d6410d89dc74159f3

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