修改db-config
Merge branch 'master' of https://github.com/shanghaishule/weixinshop.git

Conflicts:
	SRC/weTall/data/config/db.php