add entity
Merge branch 'master' of https://github.com/izou7/izou7AppServer.git

Conflicts:
	src/main/java/cn/chinattclub/izou7AppServer/entity/User.java