Merge remote-tracking branch 'origin/bugfix_7114'

services/data/chart_info.go

@@ -2881,6 +2881,8 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 		if chartItem.ChartType == 2 && chartItem.DateType <= 0 {
 			dateType = 3
 		}
+	} else {
+		calendar = req.Calendar
 	}
 	sort.Ints(edbInfoIdArr)
 	var edbInfoIdArrStr []string