Merge branch 'release' into 'master'

Release

See merge request !77

src/main/java/com/zhiwei/brandkbs2/pojo/Event.java

@@ -107,8 +107,11 @@ public class Event extends AbstractBaseMongo {
         Event event = new Event();
         event.setTitle(yqEventDTO.getName());
         event.setStartTime(yqEventDTO.getStartTime());
-        event.setEndTime(yqEventDTO.getEndTime());
-        event.setEndStatus(Objects.nonNull(yqEventDTO.getEndTime()));
+        boolean endStatus = "结束".equals(yqEventDTO.getSpreadStatus());
+        event.setEndStatus(endStatus);
+        if (endStatus) {
+            event.setEndTime(yqEventDTO.getEndTime());
+        }
         event.setKeyword(yqEventDTO.getKeyword());
         event.setEmotion(yqEventDTO.getTagInfo().getString(EventTagEnum.EVENT_ATTRIBUTE.getName()));
         event.setEventTag(yqEventDTO.getTagInfo());