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
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
index 891c0fe..7b900ba 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
@@ -177,17 +177,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