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

Conflicts:
	src/main/java/yueying/dto/entity/Activity.java