From 009f795a6e93cbb94e4a316e0efa8cb7124743f5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 19:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
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