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

无关风月

2024-08-23 26079aa3c34f47e952a9538a93d6f8a3bab9a0fc

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IntegralOrderServiceImpl.java

@@ -101,7 +101,7 @@

            if(null != map.get("time")){
                String time = map.get("time").toString();
                map.put("time", DateUtil.conversionFormat1(language, time));
                map.put("time", DateUtil.conversionFormat(language, time));
            }

        }