Merge branch 'ETA_1.8.0' into debug

controllers/data_manage/edb_info_refresh.go

@@ -42,8 +42,9 @@ func (c *EdbInfoController) RefreshSourceList() {
 			continue
 		}
 		tmp = edb_refresh.EdbRefreshSourceList{
-			Source:     v.Source,
-			SourceName: v.SourceName,
+			Source:       v.Source,
+			SourceName:   v.SourceName,
+			SourceNameEn: v.SourceNameEn,
 			//SubSource:     v.SubSource,
 			//SubSourceName: v.SubSourceName,
 			Child:    make([]edb_refresh.EdbRefreshSourceList, 0),
@@ -54,11 +55,13 @@ func (c *EdbInfoController) RefreshSourceList() {
 			for _, v2 := range tmpList {
 				if v2.Source == v.Source {
 					tmp.Child = append(tmp.Child, edb_refresh.EdbRefreshSourceList{
-						Source:        v2.Source,
-						SourceName:    v2.SourceName,
-						SubSource:     v2.SubSource,
-						SubSourceName: v2.SubSourceName,
-						HasChild:      0,
+						Source:          v2.Source,
+						SourceName:      v2.SourceName,
+						SubSource:       v2.SubSource,
+						SubSourceName:   v2.SubSourceName,
+						SourceNameEn:    v2.SourceNameEn,
+						SubSourceNameEn: v2.SubSourceNameEn,
+						HasChild:        0,
 					})
 				}
 			}

models/data_manage/edb_refresh/edb_refresh_source.go

@@ -8,14 +8,16 @@ import (
 // EdbRefreshSource
 // @Description: 刷新的数据源表
 type EdbRefreshSource struct {
-	Id            int       `orm:"column(id);pk"`
-	Source        int       `orm:"column(source)" description:"来源"`
-	SourceName    string    `description:"来源名称"`
-	SubSource     int       `description:"子数据来源:0:经济数据库,1:日期序列"`
-	SubSourceName string    `description:"子来源名称"`
-	HasChild      int       `description:"是否有子来源，0：否，1：是"`
-	ModifyTime    time.Time `description:"修改时间"`
-	CreateTime    time.Time `description:"创建时间"`
+	Id              int       `orm:"column(id);pk"`
+	Source          int       `orm:"column(source)" description:"来源"`
+	SourceName      string    `description:"来源名称"`
+	SubSource       int       `description:"子数据来源:0:经济数据库,1:日期序列"`
+	SubSourceName   string    `description:"子来源名称"`
+	HasChild        int       `description:"是否有子来源，0：否，1：是"`
+	ModifyTime      time.Time `description:"修改时间"`
+	CreateTime      time.Time `description:"创建时间"`
+	SourceNameEn    string    `description:"英文来源名称"`
+	SubSourceNameEn string    `description:"英文子来源名称"`
 }
 
 // EdbRefreshSourceList
@@ -27,6 +29,8 @@ type EdbRefreshSourceList struct {
 	SubSourceName string                 `description:"子来源名称"`
 	Child         []EdbRefreshSourceList `description:"子来源"`
 	HasChild      int                    `description:"是否有子来源，0：否，1：是"`
+	SourceNameEn    string    `description:"英文来源名称"`
+	SubSourceNameEn string    `description:"英文子来源名称"`
 }
 
 // GetAllList