Merge remote-tracking branch 'origin/master'

zss

2023-08-23 35bf80accf4117e3de030fdd7e3962f16a5fcfd9

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


}