Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel i...

无关风月

2024-10-23 25a638e0d5f282d26ff9da47e5b7aa5c9c1603d4

 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;
                }