Merge branch 'dev' into dev_zj

zss

2025-02-20 5101e344b4ac9de94d0f18d8a501158be49221ff

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java

@@ -37,5 +37,12 @@
     * @return
     */
    List<Map<String, String>> selectNameAnddepartment(@Param("participant") String participant);

    /**
     * 获取当前登录的客户信息
     * @param userId
     * @return
     */
    User getUserNow(@Param("userId") int userId);
}