Merge remote-tracking branch 'refs/remotes/origin/master' into event_new

# Conflicts:
#	src/main/java/com/zzsn/event/controller/plat/PlatEventManageController.java

src/main/java/com/zzsn/event/entity/Event.java

@@ -176,4 +176,6 @@ public class Event {
 	private String extractLocationTag;
 	@TableField(exist = false)
 	private String extractTimeTag;
+	@TableField(exist = false)
+	private String keyword;
 }