modify city
database
1
1
030
..
Merge branch 'master' of https://github.com/izou7/izou7AppServer.git

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	logs/debug.log
	logs/error.log
	logs/info.log
	target/classes/cn/chinattclub/izou7AppServer/entity/City.class
add entity
Merge branch 'master' of https://github.com/izou7/izou7AppServer.git
add entity
Merge branch 'master' of https://github.com/izou7/izou7AppServer.git
city