6-18 用户模块 表结构调整
merge
Merge branch 'master' of github.com:dapianzi/jianzhi

Conflicts:
	doc/鎷涙姇鏁版嵁缁撴瀯.docx
add