同步
同步
同步
同步
test
Merge branch 'master' of https://github.com/lianzhengkun/easyshopping

Conflicts:
	src/main/resources/hibernate.cfg.xml
	src/main/resources/resources.properties
up-to-date
Merge branch 'master' of https://github.com/lianzhengkun/easyshopping

Conflicts:
	src/main/resources/hibernate.cfg.xml
Merge branch 'master' of https://github.com/lianzhengkun/easyshopping
up-to-date