Merge remote-tracking branch 'origin/custom'

controllers/data_manage/edb_info.go

@@ -5774,11 +5774,14 @@ func (this *EdbInfoController) EdbInfoBatchAdd() {
 			edbInfoItem.SourceName = "ths"
 			edbInfoItem.EdbCode = utils.ThsDs + v.StockCode + v.EdbCode
 		}
-		edbInfoItem.SubSource = 1
+		edbInfoItem.SubSource = utils.DATA_SUB_SOURCE_DATE
 		edbInfoItem.SubSourceName = "日期序列"
 		edbInfoItem.EdbName = v.EdbName
+		edbInfoItem.EdbNameSource = v.EdbName
+		edbInfoItem.EdbNameEn = v.EdbName
 		edbInfoItem.Frequency = v.Frequency
 		edbInfoItem.Unit = v.Unit
+		edbInfoItem.UnitEn = v.Unit
 		edbInfoItem.ClassifyId = v.ClassifyId
 		edbInfoItem.SysUserId = sysUser.AdminId
 		edbInfoItem.SysUserRealName = sysUser.RealName
@@ -6363,8 +6366,11 @@ func (this *EdbInfoController) SmmEdbInfoBatchAdd() {
 		edbInfoItem.SubSource = 0
 		edbInfoItem.SubSourceName = ""
 		edbInfoItem.EdbName = v.EdbName
+		edbInfoItem.EdbNameSource = v.EdbName
+		edbInfoItem.EdbNameEn = v.EdbName
 		edbInfoItem.Frequency = v.Frequency
 		edbInfoItem.Unit = v.Unit
+		edbInfoItem.UnitEn = v.Unit
 		edbInfoItem.ClassifyId = v.ClassifyId
 		edbInfoItem.SysUserId = sysUser.AdminId
 		edbInfoItem.SysUserRealName = sysUser.RealName