Forráskód Böngészése

Merge branch 'ETA_1.5.8' into debug

zwxi 1 éve
szülő
commit
c6cb69c55c
1 módosított fájl, 1 hozzáadás és 1 törlés
  1. 1 1
      models/data_manage/chart_edb_mapping.go

+ 1 - 1
models/data_manage/chart_edb_mapping.go

@@ -47,7 +47,7 @@ func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err e
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*,b.source_name,b.source,b.sub_source,b.classify_id,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,
 b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type,b.edb_type,
-b.is_convert, b.convert_type, b.convert_value, b.convert_unit, b.convert_en_unit 
+a.is_convert, a.convert_type, a.convert_value, a.convert_unit, a.convert_en_unit 
              FROM chart_edb_mapping AS a
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			 WHERE chart_info_id=?