From a5255613206a8f9307b825f5ab32c41eb42ef169 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 10 六月 2021 13:23:30 +0800
Subject: [PATCH] 代码合并以及问题修复
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index c90fe25..4455ebf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -4,10 +4,7 @@
import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberEditStatusDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberPassResetDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -937,7 +934,7 @@
* @return 修改结果
*/
@PostMapping("editGridUser")
- public R gridMemberEdit(@RequestBody EventGridMemberAddDTO gridMemberDTO){
+ public R gridMemberEdit(@RequestBody EventGridMemberEditAdminDTO gridMemberDTO){
return userService.editGridUser(gridMemberDTO);
}
@@ -966,5 +963,10 @@
return userService.gridMemberEditStatus(gridMemberEditDTO);
}
+ @GetMapping("big/no/tip")
+ public R noTips(@RequestParam("userId") Long userId){
+ return userService.noTips(userId);
+ }
+
}
--
Gitblit v1.7.1