From 9fc3cec0d40c86b8b4a8e34dcf7a82645ccbd192 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十二月 2023 11:55:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index ba74171..edd1a97 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.admin.request.LaborMemberDTO;
+import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
@@ -85,6 +86,14 @@
return ApiResponse.success(null);
}
+ @ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
+ @PostMapping("/updateCanVisitById")
+ @RequiresPermissions("business:member:update")
+ public ApiResponse updateCanVisitById(@RequestBody Member member){
+ memberService.updateCanVisitById(member);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:member:query")
@@ -94,7 +103,7 @@
@ApiOperation("鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ")
@PostMapping("/findLaborMemberInfoPage")
- @RequiresPermissions("business:member:query")
+// @RequiresPermissions("business:member:query")
public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
}
@@ -112,4 +121,18 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(memberService.findById(id));
}
+
+
+ /**
+ *
+ * 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
+ * @param pageWrap
+ * @return
+ */
+ @ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
+ @PostMapping("/findMemberInfoPage")
+ @RequiresPermissions("business:member:query")
+ public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
+ return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
+ }
}
--
Gitblit v1.9.3