Merge branch 'feature/pool255_future_good' into debug

controllers/data_manage/future_good/future_good_chart_info.go

@@ -1407,8 +1407,9 @@ func getFutureGoodChartInfo(chartInfo *data_manage.ChartInfoView, chartType, dat
 			if barConfig.FutureGoodEdbName != "" {
 				name[0] = barConfig.FutureGoodEdbName
 			}
+			v.EdbName = name[0]
 			if len(name) > 1 {
-				v.EdbName = name[0] + "(" + name[1]
+				v.EdbName = v.EdbName + "(" + name[1]
 			}
 			//英文
 			// 编译正则表达式，匹配一个或多个数字
@@ -1418,8 +1419,9 @@ func getFutureGoodChartInfo(chartInfo *data_manage.ChartInfoView, chartType, dat
 				if barConfig.FutureGoodEdbNameEn != "" {
 					name[0] = barConfig.FutureGoodEdbNameEn
 				}
+				v.EdbNameEn = name[0]
 				if len(name) > 1 {
-					v.EdbNameEn = name[0] + "(" + name[1]
+					v.EdbNameEn = v.EdbNameEn + "(" + name[1]
 				}
 			}
 		}
@@ -1759,8 +1761,9 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 			if barConfig.FutureGoodEdbName != "" {
 				name[0] = barConfig.FutureGoodEdbName
 			}
+			v.EdbName = name[0]
 			if len(name) > 1 {
-				v.EdbName = name[0] + "(" + name[1]
+				v.EdbName = v.EdbName + "(" + name[1]
 			}
 			//英文
 			// 编译正则表达式，匹配一个或多个数字
@@ -1770,8 +1773,9 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				if barConfig.FutureGoodEdbNameEn != "" {
 					name[0] = barConfig.FutureGoodEdbNameEn
 				}
+				v.EdbNameEn = name[0]
 				if len(name) > 1 {
-					v.EdbNameEn = name[0] + "(" + name[1]
+					v.EdbNameEn = v.EdbNameEn + "(" + name[1]
 				}
 			}
 		}