Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 8a0469c97262be9ecbc5eae38d812da789635c81

 server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java

@@ -161,7 +161,7 @@
        PageData<Notices> pageData = PageData.from(noticesMapper.selectJoinPage(page,Notices.class, queryWrapper));
        pageData.getRecords().forEach(i->{
            i.setTypeDetail(
                    Constants.NoticeType.getDetail(i.getObjType(),i.getType())
                    Constants.NoticeType.getDetail(i.getType(),i.getObjType())
            );
        });
        return pageData;