修改数据库名称 ／
微游戏左侧列表
Merge remote-tracking branch 'origin/master'

Conflicts:
	weixin_crm/config/database.php
注册界面和接口的调用
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm

Conflicts:
	weixin_crm/config/database.php
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm
aaaa