|
|
@@ -2519,17 +2519,13 @@ func (this *ChartInfoController) CopyChartInfo() {
|
|
|
ExtraConfig: oldChartInfo.ExtraConfig,
|
|
|
SeasonExtraConfig: oldChartInfo.SeasonExtraConfig,
|
|
|
StartYear: oldChartInfo.StartYear,
|
|
|
-<<<<<<< HEAD
|
|
|
- Instructions: oldChartInfo.Instructions,
|
|
|
Unit: oldChartInfo.Unit,
|
|
|
UnitEn: oldChartInfo.UnitEn,
|
|
|
-=======
|
|
|
ChartThemeId: oldChartInfo.ChartThemeId,
|
|
|
SourcesFrom: oldChartInfo.SourcesFrom,
|
|
|
Instructions: oldChartInfo.Instructions,
|
|
|
MarkersLines: oldChartInfo.MarkersLines,
|
|
|
MarkersAreas: oldChartInfo.MarkersAreas,
|
|
|
->>>>>>> origin/eta/1.4.1
|
|
|
}
|
|
|
newId, err := data_manage.AddChartInfo(chartInfo)
|
|
|
if err != nil {
|
