From 83479607bc5ffea9ad5e9be36088c7f742ba00d9 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期二, 29 六月 2021 11:03:17 +0800
Subject: [PATCH] 实有人口导入,走访导出

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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..47a065b 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;
@@ -328,7 +325,7 @@
      * @return 协议集合
      */
     @PostMapping("listagreement")
-    R listAgreement();
+    R listAgreement(@RequestParam("communityId")Long communityId);
 
     /**
      * 编辑用户协议
@@ -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