客片留影 功能相关基类
.....
Merge branch 'master' of github.com:lcjiao/haidao

Conflicts:
	domain-island/src/main/resources/com/island/domain/DomainIslandModuleContext.xml
	gen-dal/log.log
...