Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-19 d0a6fc23f31f924cb1744397478dc4c7c57c04e1

 user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java

@@ -72,6 +72,12 @@
    String selectByUserId(Integer userId);

    /**
     * 查询所有用户信息
     * @return
     */
    List<Map> selectUser();

    /**
     * 获取所有用户的名称与Id
     */
    List<Map<String, Object>> getUserNameAndId();