Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-23 924d018e6e6f15effbd272cead5dff67cd3b93a5

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

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

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

    List<User> selectUser();
    List<Map<String,Object>> selectUser();


}