Merge branch 'sql_fix_0620' into debug

# Conflicts:
#	models/data_manage/trade_analysis/trade_analysis.go

models/data_manage/trade_analysis/trade_analysis.go

@@ -94,7 +94,7 @@ func GetExchangeClassify(exchange string) (list []TradeClassifyName, err error)
 	if exchange == "zhengzhou" {
 		orderStr = "classify_name asc"
 	}
-	sql := "SELECT classify_name, classify_type FROM ` + tableName + ` WHERE `rank` <=20 and `rank` > 0 GROUP BY classify_name, classify_type  "
+	sql := "SELECT classify_name, classify_type FROM " + tableName + " WHERE `rank` <=20 and `rank` > 0 GROUP BY classify_name, classify_type  "
 	sql += ` ORDER BY ` + orderStr
 
 	o := orm.NewOrmUsingDB("data")