From 48effdca685a209c19dd2a0ccd456470a895784b Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 11 十月 2024 18:01:18 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0 --- UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java index 54a5d3e..79d84d6 100644 --- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java +++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java @@ -72,13 +72,13 @@ * @throws Exception */ @Override - public List<Map<String, Object>> queryProblems(Integer pageNum, Integer size, Integer uid, Integer languag) throws Exception { + public List<Map<String, Object>> queryProblems(Integer pageNum, Integer size, Integer uid, Integer language) throws Exception { pageNum = (pageNum - 1) * size; List<Map<String, Object>> list = problemMapper.queryProblems(pageNum, size, uid); for (Map<String, Object> map : list) { if(null != map.get("insertTime")){ String insertTime = map.get("insertTime").toString(); - map.put("insertTime", DateUtil.conversionFormat(languag, insertTime)); + map.put("insertTime", DateUtil.conversionFormat(language, insertTime)); } } return list; -- Gitblit v1.7.1