Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

12 小时以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java

@@ -182,8 +182,8 @@
            if (!userIds.isEmpty()) {
                sysNoticeService.simpleNoticeByUser(
                        "会议通知",
                        "会议主题：" + application.getTitle() + "\n" +
                                "会议时间：" + application.getStartTime() + "-" + application.getEndTime() + "\n" +
                        "会议主题：" + application.getTitle() + "\t" +
                                "会议时间：" + application.getStartTime() + "-" + application.getEndTime() + "\t" +
                                "发起人：" + application.getApplicant(),
                        userIds,
                        ""