From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel 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