# Conflicts:
#	src/main/java/com/zzsn/event/controller/PlatEventManageController.java
#	src/main/java/com/zzsn/event/controller/SubjectManageController.java
#	src/main/java/com/zzsn/event/controller/yjzx/NewEventManageController.java
#	src/main/java/com/zzsn/event/service/IEventService.java
#	src/main/java/com/zzsn/event/service/impl/EventServiceImpl.java