数据库初始表
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/account.sql
Merge remote-tracking branch 'origin/master'
没有附加信息时会报错