From 7c26ec693561ecce9fba31ab4e83e9f30d641aad Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 06 五月 2024 17:57:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
index 8db9c17..f0fdcfe 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
@@ -179,17 +179,19 @@
date = datetime.substring(0, datetime.indexOf(" "));
}
String[] split = date.split("-");
+ //'%m-%d %H:%i'
+ String m = "";
switch (language){
case 2:
- split[1] = englishMonth(Integer.valueOf(split[0]));
- datetime = split[0] + " " + split[1];
+ m = englishMonth(Integer.valueOf(split[0]));
+ datetime = m + " " + split[1];
if(index != -1){
datetime += " " + time;
}
break;
case 3:
- split[1] = frenchMonth(Integer.valueOf(split[0]));
- datetime = split[1] + " " + split[0];
+ m = frenchMonth(Integer.valueOf(split[0]));
+ datetime = split[1] + " " + m;
if(index != -1){
datetime += " " + time;
}
--
Gitblit v1.7.1