11
Merge branch 'master' of https://github.com/onesliu/NoMark

Conflicts:
	debug/GOODS.GDB
Merge branch 'master' of https://github.com/onesliu/NoMark
1.得到更新价格消息后，读取调价单文件，更新数据库。