Merge remote-tracking branch 'origin/master'

mitao

4 天以前 dfe379f10f5d16a3b34b33f260d3a7ca97c7fdc6

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaNotificationMapper.java

@@ -21,4 +21,6 @@

    List<NotificationVO> pageList(@Param("query")NotificationListQuery query, @Param("pageInfo")PageInfo<NotificationVO> pageInfo);

    List<NotificationVO> pageListUser(@Param("query")NotificationListQuery query, @Param("pageInfo")PageInfo<NotificationVO> pageInfo);

}