Merge branch 'fuqc0815-dev' into 'master'

fuqc0815

2020-12-11 848c3332f2de93957b06d1471a9eedaa1faec88f

 service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java

@@ -274,7 +274,7 @@
            data.setFirst(new Content(noticeDto.getTitle()));
            data.setKeyword1(new Content(noticeDto.getTitle()));
            data.setKeyword2(new Content(noticeDto.getStartTime()));
            data.setKeyword3(new Content(noticeDto.getContext()));
            data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
            data.setRemark(new Content("如有疑问请联系相关物业人员"));
            templateMessage.setData(data);
            templateMessage.setUrl(wechatUrl + noticeDto.getNoticeId());
@@ -325,7 +325,7 @@
            data.setFirst(new Content(noticeDto.getTitle()));
            data.setKeyword1(new Content(noticeDto.getTitle()));
            data.setKeyword2(new Content(noticeDto.getStartTime()));
            data.setKeyword3(new Content(noticeDto.getContext()));
            data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
            data.setRemark(new Content("如有疑问请联系相关物业人员"));
            templateMessage.setData(data);
            if (!StringUtil.isEmpty(wechatUrl)) {