# Conflicts:
#	signal-optimize-service/src/main/java/net/wanji/opt/controller/EventController.java
#	signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/HoloEventMapper.java
#	signal-optimize-service/src/main/java/net/wanji/opt/service/EventService.java
#	signal-optimize-service/src/main/java/net/wanji/opt/service/impl/EventServiceImpl.java