Merge branch 'feature/eta1.9.7_interval_analysis' into debug

# Conflicts:
#	models/data_manage/chart_info_range_analysis.go

models/data_manage/chart_info_range_analysis.go

@@ -28,7 +28,16 @@ type ChartRangeAnalysisExtraConf struct {
 type ChartRangeAnalysisAutoDateChangeConf struct {
 	BaseDateType int `description:"基准日期类型：0指标日期，1系统日期"`
 	MoveForward  int `description:"前移的期数"`
-	DateChange   []*EdbDateConfDateChange
+	DateChange   []*EdbDataDateChangeConf
+}
+
+type EdbDataDateChangeConf struct {
+	Year         int
+	Month        int
+	Day          int
+	Frequency    string `description:"频度变换"`
+	FrequencyDay string `description:"频度的固定日期"`
+	ChangeType   int    `description:"日期变换类型1日期位移，2指定频率"`
 }
 
 type ChartRangeAnalysisDeleteDataConf struct {

services/data/range_analysis/chart_info.go

@@ -1844,7 +1844,7 @@ func GetEdbDateByMoveForward(startDate string, moveForward int, edbDataList []*d
 }
 
 // HandleEdbDateChange 处理日期变换
-func HandleEdbDateChange(date string, dateChange []*data_manage.EdbDateConfDateChange) (newDate string, err error) {
+func HandleEdbDateChange(date string, dateChange []*data_manage.EdbDataDateChangeConf) (newDate string, err error) {
 	newDate = date
 	if newDate != "" {
 		if len(dateChange) > 0 {