Merge remote-tracking branch 'origin/master'

无关风月

2024-08-20 9f88b12d16c83963dad8fb8f79d9eeba2c311518

 guns-management/src/main/java/com/stylefeng/guns/modular/system/dao/UserMapper.java

@@ -44,6 +44,5 @@
    User getByAccount(@Param("account") String account);

    Map<String, Object> getSysUserDetails(Integer id);

    List<Map<String, Object>> getUsers(String account);
    List<Map<String, Object>> getUsers(@Param("phone")String phone,@Param("name")String name,@Param("deptName")String deptName);
}