Merge remote-tracking branch 'origin/master'

Administrator

2023-07-25 0533bbabfe22484a84c85d13a391a1fd5cb949c2

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

@@ -132,4 +132,10 @@
     * @return 结果
     */
    public SysUser checkEmailUnique(String email);

    /**
     * 根据车辆主键查询直属及上级用户
     *
     */
    public List<SysUser> getSysUserByCarId(String carId);
}