叠加查询

查询增加叠加查询
Merge branch 'master' of https://github.com/caicaicai/5star

Conflicts:
	public/scripts/modules/market/module.js
	public/styles/main.css