pinyin
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/dgsoft/house/property/model/PoolBuild.java