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
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SystemNoticeController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SystemNoticeController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SystemNoticeController.java
index 5df9655..180edaa 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SystemNoticeController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SystemNoticeController.java
@@ -77,13 +77,13 @@
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<SystemNoticeWarpper>> queryNotices(Integer type, Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<SystemNoticeWarpper>> queryNotices(Integer language, Integer type, Integer pageNum, Integer size, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = systemNoticeService.queryList(type, pageNum, size, uid);
+ List<Map<String, Object>> list = systemNoticeService.queryList(language, type, pageNum, size, uid);
return ResultUtil.success(SystemNoticeWarpper.getSystemNoticeWarpper(list));
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1