Merge remote-tracking branch 'origin/master'

doum

9 小时以前 1af395ecb948a9d0af14aa72d7fc8025e849e6bc

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java

@@ -216,7 +216,6 @@

    @Override
    public PageData<NoticeCardDTO> findNoticeCardDTOPage(PageWrap<Notice> pageWrap) {

        LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
        IPage<Notice> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        LambdaQueryWrapper<Notice> queryWrapper = new LambdaQueryWrapper<>();
@@ -242,4 +241,5 @@
        pageData.setRecords(noticeCardDTOs);
        return pageData;
    }

}