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

gongchunyi

昨天 1bc0c6c7842e29711e576e58b0aca00fabd92df0

 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);
}