Merge remote-tracking branch 'origin/debug' into debug

controllers/data_manage/chart_info.go

@@ -2436,14 +2436,15 @@ func (this *ChartInfoController) CopyChartInfo() {
 		ChartImage:      oldChartInfo.ChartImage,
 		BarConfig:       oldChartInfo.BarConfig,
 		//Sort:     sort,
-		LeftMin:     oldChartInfo.LeftMin,
-		LeftMax:     oldChartInfo.LeftMax,
-		RightMin:    oldChartInfo.RightMin,
-		RightMax:    oldChartInfo.RightMax,
-		Disabled:    oldChartInfo.Disabled,
-		Source:      oldChartInfo.Source,
-		ExtraConfig: oldChartInfo.ExtraConfig,
-		StartYear:   oldChartInfo.StartYear,
+		LeftMin:           oldChartInfo.LeftMin,
+		LeftMax:           oldChartInfo.LeftMax,
+		RightMin:          oldChartInfo.RightMin,
+		RightMax:          oldChartInfo.RightMax,
+		Disabled:          oldChartInfo.Disabled,
+		Source:            oldChartInfo.Source,
+		ExtraConfig:       oldChartInfo.ExtraConfig,
+		SeasonExtraConfig: oldChartInfo.SeasonExtraConfig,
+		StartYear:         oldChartInfo.StartYear,
 	}
 	newId, err := data_manage.AddChartInfo(chartInfo)
 	if err != nil {

controllers/data_manage/edb_info.go

@@ -3773,7 +3773,11 @@ func (this *ChartInfoController) EdbInfoDataSeasonal() {
 		calendar = "公历"
 	}
 	if dateType == 0 {
-		dateType = utils.DateTypeNYears
+		if startDate == "" {
+			dateType = utils.DateTypeNYears
+		} else {
+			dateType = 5
+		}
 	}
 
 	edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)