Merge branch 'sci_fix' into custom

models/data_manage/edb_data_sci99.go

@@ -12,13 +12,13 @@ type Sci99Data struct {
 
 func GetEdbDataSci99MaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_icpi WHERE edb_code=? `
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_sci99 WHERE edb_code=? `
 	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
 	return
 }
 
 type BaseFromSci99IndexItem struct {
-	BaseFromSciIndexId int    `orm:"column(base_from_sci_index_id);pk"` // 主键，自动递增
+	BaseFromSciIndexId int    `orm:"column(base_from_sci99_index_id);pk"` // 主键，自动递增
 	IndexCode          string // 指标编码
 	IndexName          string // 指标名称
 	ClassifyId         int    // 分类Id