Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-21 4b55cf8d21443e366f83acf20c4333abef8f54ae

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

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

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

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


}