Merge branch 'eta/1.0.3'

models/edb_info.go

@@ -46,6 +46,7 @@ type EdbInfo struct {
 	ChartImage       string  `description:"图表图片"`
 	Calendar         string  `description:"公历/农历" orm:"default(公历);"`
 	DataDateType     string  `orm:"column(data_date_type);size(255);null;default(交易日)"`
+	ManualSave       int     `description:"是否有手动保存过上下限: 0-否; 1-是"`
 }
 
 func (e *EdbInfo) Add() (err error) {
@@ -372,6 +373,10 @@ func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (ite
 
 // UnifiedModifyEdbInfoMaxAndMinInfo 统一修改指标的最大最小值
 func UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo *EdbInfo) (err error, errMsg string) {
+	// ETA1.0.3改-如果指标有手动保存过, 那么就不更新指标的最大最小值
+	if edbInfo.ManualSave == 1 {
+		return
+	}
 	// 修改最大最小值
 	maxAndMinItem, err := GetEdbInfoMaxAndMinInfo(edbInfo.Source, edbInfo.EdbCode)
 	if err != nil {