From f9fff682ff6b21344401bb86f85d25c97c37b073 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 22 七月 2024 17:01:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js
index a29b0fa..04e5547 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js
@@ -438,7 +438,7 @@
 	if (!defined(timestamp) || isNaN(timestamp)) {
 		return 'Invalid date';
 	}
-	format = pick(format, '%Y-%m-%d %H:%M:%S');
+	format = pick(format, 'yyyy-MM-dd %H:%M:%S');
 
 	var date = new Date(timestamp),
 		key, // used in for constuct below

--
Gitblit v1.7.1