调整数据库设计
Merge branch 'master' of https://github.com/sklay/njztsm

Conflicts: