Merge branch 'feature/eta2.1.2_predit_edb' into debug

# Conflicts:
#	models/data_manage/edb_data_base.go
#	utils/constants.go

models/data_manage/edb_data_base.go

@@ -181,8 +181,6 @@ func GetEdbDataTableName(source, subSource int) (tableName string) {
 		tableName = "edb_data_sci_hq"
 	case utils.DATA_SOURCE_LY: // 粮油商务网->86
 		tableName = "edb_data_ly"
-	case utils.DATA_SOURCE_PREDICT:
-		tableName = "edb_data_predict_base"
 	default:
 		edbSource := EdbSourceIdMap[source]
 		if edbSource != nil {

models/data_manage/edb_info.go

@@ -66,7 +66,6 @@ type EdbInfo struct {
 	MaxEmptyType     int     `description:"MAX、MIN公式空值处理类型（1、等于0；2、跳过空值）"`
 	Extra            string  `description:"指标额外配置"`
 	IsJoinPermission int     `description:"是否加入权限管控，0：不加入；1：加入；默认：0"`
-	IsStaticData     int     `description:"是否是静态指标，0动态指标，1静态指标"`
 }
 
 type EdbInfoFullClassify struct {

utils/constants.go

@@ -181,6 +181,7 @@ const (
 	DATA_SOURCE_LY                                   = 91       // 粮油商务网
 	DATA_SOURCE_FENWEI                               = 77       // 汾渭数据->92
 	DATA_SOURCE_HISUGAR                              = 93       // 泛糖科技 -> 93
+	DATA_SOURCE_PREDICT_STATIC                       = 94       // 静态指标 -> 94
 )
 
 // 数据刷新频率