the newest version
Merge branch 'master' of https://github.com/lydgithub/YueYingServer.git

Conflicts:
	src/main/java/yueying/service/ActivityService.java
	src/main/java/yueying/ui/controller/ActivityController.java
	src/main/java/yueying/ui/model/ActivityModel.java
feixiao