소스 검색

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

# Conflicts:
#	models/data_manage/edb_info.go
xyxie 7 달 전
부모
커밋
f089032cb7
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      models/data_manage/edb_info.go

+ 2 - 1
models/data_manage/edb_info.go

@@ -66,7 +66,7 @@ type EdbInfo struct {
 	MaxEmptyType     int     `description:"MAX、MIN公式空值处理类型(1、等于0;2、跳过空值)"`
 	Extra            string  `description:"指标额外配置"`
 	IsJoinPermission int     `description:"是否加入权限管控,0:不加入;1:加入;默认:0"`
-	IsStaticData     int     `description:"指标额外配置"`
+	IsStaticData     int     `description:"是否是静态指标,0否,1是"`
 }
 
 type EdbInfoFullClassify struct {
@@ -455,6 +455,7 @@ type EdbInfoList struct {
 	IsJoinPermission int                     `description:"是否加入权限管控,0:不加入;1:加入;默认:0"`
 	HaveOperaAuth    bool                    `description:"是否有数据权限,默认:false"`
 	IsSupplierStop   int                     `description:"是否供应商停更:1:停更,0:未停更"`
+	IsStaticData     int                     `description:"是否是静态指标,0否,1是"`
 }
 
 type EdbDataInsertConfigItem struct {