Merge branch 'feature/eta1.6.5_edb_calculate' into debug

# Conflicts:
#	models/data_manage/edb_info.go

models/data_manage/edb_info.go

@@ -57,6 +57,7 @@ type EdbInfo struct {
 	StockCode        string  `description:"证券代码"`
 	EmptyType        int     `description:"空值处理类型（0查找前后35天，1不计算，2前值填充，3后值填充，4等于0）"`
 	MaxEmptyType     int     `description:"MAX、MIN公式空值处理类型（1、等于0；2、跳过空值）"`
+	Extra            string  `description:"指标额外配置"`
 }
 
 type EdbInfoFullClassify struct {
@@ -1597,8 +1598,8 @@ type EdbInfoDataSeasonalResp struct {
 
 // SetEdbDataInsertConfigReq 设置插入规则的请求
 type SetEdbDataInsertConfigReq struct {
-	EdbInfoId int     `description:"指标ID"`
-	Date      string  `description:"日期"`
+	EdbInfoId int    `description:"指标ID"`
+	Date      string `description:"日期"`
 	Value     string `description:"值"`
 }