Merge branch 'ETA_1.5.8' into debug

controllers/data_manage/chart_info.go

@@ -1030,6 +1030,13 @@ func (this *ChartInfoController) PreviewChartInfoDetail() {
 				}
 			}
 		}
+		if req.ChartEdbInfoList[k].IsConvert == 1 {
+			v.IsConvert = 1
+			v.ConvertType = req.ChartEdbInfoList[k].ConvertType
+			v.ConvertValue = req.ChartEdbInfoList[k].ConvertValue
+			v.ConvertUnit = req.ChartEdbInfoList[k].ConvertUnit
+			v.ConvertEnUnit = req.ChartEdbInfoList[k].ConvertEnUnit
+		}
 		mappingList[k] = v
 	}