Merge branch 'feature/eta1.3.9_smm_gl' into debug

# Conflicts:
#	models/data_manage/mysteel_chemical_index.go

models/data_manage/mysteel_chemical_index.go

@@ -70,8 +70,8 @@ type MysteelChemicalFrequency struct {
 // GetMysteelChemicalIndexByClassifyId 用于分类展示
 func GetMysteelChemicalIndexByClassifyId(classifyId int) (items []*BaseFromMysteelChemicalClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT base_from_mysteel_chemical_index_id,base_from_mysteel_chemical_classify_id,index_name AS classify_name,index_code,
-             sys_user_id,sys_user_real_name,sort
+	sql := ` SELECT base_from_mysteel_chemical_index_id,base_from_mysteel_chemical_classify_id,index_name AS classify_name,
+             sys_user_id,sys_user_real_name,sort,index_code 
             FROM base_from_mysteel_chemical_index where base_from_mysteel_chemical_classify_id=? ORDER BY sort asc, create_time ASC `
 	_, err = o.Raw(sql, classifyId).QueryRows(&items)
 	return