Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

10 天以前 a3c54410de03f0fd242e1a1118d6471300cf1eda

 src/main/java/com/ruoyi/project/system/service/ISysUserDeptService.java

@@ -6,5 +6,5 @@

public interface ISysUserDeptService {

    List<SysUserDeptVo> selectUserDeptList(SysUserDeptVo userDeptVo);
    List<SysUserDeptVo> userLoginFacotryList(SysUserDeptVo userDeptVo);
}