first data integration, demo.foo
Merge branch 'master' of https://github.com/MangoFYang/xiang.git

Conflicts:
	xiang-demo-service/src/test/java/com/yangfan/xiang/service/impl/demo/abc/FooServiceImplTest.java