fix db bug
littlechange
xxx
...
merge.
client.cpp  has changed
to merge
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	client/client.cpp
修改insert