From 98e440f566479fe07b0a6d0028e3df21843c86ee Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 17 六月 2021 17:21:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 14fa1be..9e5f7eb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.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.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
@@ -735,7 +732,7 @@
* @return 修改结果
*/
@PostMapping("editGridUser")
- R editGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);
+ R editGridUser(@RequestBody EventGridMemberEditAdminDTO eventGridMemberAddDTO);
/**
* 重置网格员密码
@@ -760,4 +757,7 @@
*/
@PostMapping("gridMemberEditStatus")
R gridMemberEditStatus(@RequestBody EventGridMemberEditStatusDTO gridMemberEditDTO);
+
+ @GetMapping("big/no/tip")
+ R noTips(@RequestParam("userId") Long userId);
}
--
Gitblit v1.7.1