创建实体，html提交
项目文件
数据库配置
Merge branch 'dev' of https://github.com/zchen01/hn-project into dev

Conflicts:
	.gitignore
	hn-platform/hn-travel-cms/src/main/java/hn/travel/cms/web/account/AddressBookController.java
	hn-platform/hn-travel-persist/.classpath
	hn-platform/hn-travel-persist/.project
	hn-platform/hn-travel-persist/src/main/resources/application.properties
Merge branch 'dev' of https://github.com/zchen01/hn-project into dev