Merge remote-tracking branch 'origin/master'

mitao

2 天以前 325c6107782d4a2284bb24be688e7a87462dc202

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

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

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