修复查询goods_detail表为空的bug,改为统一查询tools_detail
Merge branch 'master' of github.com:334777583/tcht

Conflicts:
	logic/controls/shopanalysis.class.php