From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js
index d461476..1cddcff 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js
@@ -416,7 +416,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 - timezoneOffset),
key, // used in for constuct below
--
Gitblit v1.7.1