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

liyong

2 天以前 80c45ea7934443bea5355bc6bace96ec23a58600

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