Merge remote-tracking branch 'origin/master'

mitao

3 天以前 853c8ba11072eae475273864e61733ae7294f004

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaNotificationServiceImpl.java

@@ -60,6 +60,6 @@

        }
        pageInfo.setRecords(list);
        return null;
        return pageInfo;
    }
}