Merge branch 'dev/1.5' into debug

controllers/data_manage/my_chart.go

@@ -1934,6 +1934,12 @@ func (this *MyChartController) Locate() {
 				v.ChartClassifyName = cl.ChartClassifyName
 				v.UniqueCode = ch.UniqueCode
 				v.Source = ch.Source
+				v.StartDate = ch.StartDate
+				v.EndDate = ch.EndDate
+				v.SeasonStartDate = ch.SeasonStartDate
+				v.SeasonEndDate = ch.SeasonEndDate
+				v.DateType = ch.DateType
+				v.Calendar = ch.Calendar
 				list = append(list, v)
 			}
 		}
@@ -1954,6 +1960,12 @@ func (this *MyChartController) Locate() {
 		v.ChartClassifyName = classifyIdName[v.ChartClassifyId]
 		v.UniqueCode = ch.UniqueCode
 		v.Source = ch.Source
+		v.StartDate = ch.StartDate
+		v.EndDate = ch.EndDate
+		v.SeasonStartDate = ch.SeasonStartDate
+		v.SeasonEndDate = ch.SeasonEndDate
+		v.DateType = ch.DateType
+		v.Calendar = ch.Calendar
 		list = append(list, v)
 	}
 	br.Ret = 200

models/data_manage/chart_info.go

@@ -1705,6 +1705,10 @@ type ChartInfoLocate struct {
 	ChartClassifyName string `description:"图表分类名称"`
 	UniqueCode        string `description:"图表唯一编码"`
 	Source            int    `description:"1：ETA图库；2：商品价格曲线；3：相关性图表"`
-	//PrevChartInfoId   int    `description:"上一张图表ID"`
-	//NextChartInfoId   int    `description:"下一张图表ID"`
+	StartDate         string `description:""`
+	EndDate           string `description:""`
+	SeasonStartDate   string `description:""`
+	SeasonEndDate     string `description:""`
+	DateType          int    `description:""`
+	Calendar          string `description:""`
 }