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

liyong

4 天以前 33f9eae4ad4321860e4881f5f38dad6368c878ef

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