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

src/main/java/com/zzsn/event/service/impl/ConfigurationMessageService.java

@@ -442,6 +442,7 @@ public class ConfigurationMessageService {
             Map<String,Object> map = new HashMap<>();
             map.put("collectWordExp",e.getKeyWord());
             map.put("keywordSign",e.getId());
+            map.put("type",type);
 //            if (ObjectUtil.isNotEmpty(subject.getTimeEnable())) {
 //                map.put("beginDate",DateUtil.format(subject.getTimeEnable(),"yyyy-MM-dd HH:mm:ss"));
 //            }else {