From a606bc5b0af6bc85b8ce2bca66a1d74fac3751b7 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 22 七月 2024 17:19: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/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