Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

@@ -257,6 +257,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
                 StringBuilder builder = new StringBuilder(groupRedis.get(topic.getGroupId()).getGroupName()).append("小组中评论");
                 String content = CharMatcher.WHITESPACE.trimFrom(topic.getTopicContent());
                 if(StringUtils.isNotBlank(content)){
+                    builder.append("话题");
                     builder.append("\"");
                     builder.append(
                             content.length() > NumConstant.TEN ?

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1598,7 +1598,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 pointEventMsg.setUserId(group.getTopicAuthorId());
                 pointEventMsg.setActionFlag(MqConstant.PLUS);
                 pointEventMsg.setIsCommon(false);
-
+                pointEventMsg.setEventTag(EventEnum.TOPIC_SHIFTED_TO_ISSUE.getEventTag());
                 //某某小组中发布的话题“某某某…” （前十个字后面省略号） 被转为议题
                 String content = CharMatcher.WHITESPACE.trimFrom(topic.getTopicContent());
 				pointEventMsg.setRemark(new StringBuilder(groupCache.getGroupName()).append("小组中发布的")