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

无关风月

2024-10-23 25a638e0d5f282d26ff9da47e5b7aa5c9c1603d4

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

@@ -82,8 +82,10 @@
    public List<Map<String, Object>> queryCancel(Integer language, Integer uid, Integer isPay) throws Exception {
      List<Map<String, Object>> list = orderCancelMapper.queryCancel(uid, isPay);
        for (Map<String, Object> map : list) {
            String time = map.get("time").toString();
            map.put("time", DateUtil.conversionFormat(language, time));
            if(null != map.get("time")){
                String time = map.get("time").toString();
                map.put("time", DateUtil.conversionFormat(language, time));
            }
        }
        return list;
    }