个人物品报文拼接完毕 待整合数据
Merge branch 'master' of https://github.com/iacdingping/test.git

Conflicts:
	qsync-core/src/main/java/com/openteach/qsync/core/ConfigService.java
	qsync-core/src/main/resources/schame/mysql.sql
	qsync-service/src/main/java/com/openteach/qsync/service/declare/AssembleService.java
	qsync-service/src/main/resources/override.development.properties