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

liyong

2 天以前 b9d7eb36481c3ac327f85a38dab1cbee1163be40

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