From 9b583c3ae9f78328368b2eda8899f80204ed796f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 31 Aug 2021 11:33:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

---
 src/main/java/org/springblade/modules/member/controller/MemberController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/member/controller/MemberController.java b/src/main/java/org/springblade/modules/member/controller/MemberController.java
index f66a578..7b652aa 100644
--- a/src/main/java/org/springblade/modules/member/controller/MemberController.java
+++ b/src/main/java/org/springblade/modules/member/controller/MemberController.java
@@ -137,8 +137,8 @@
 	 * @return
 	 */
 	@PostMapping("/selectMemberInfo")
-	public R<IPage<MemberVO>> selectMemberInfo(String creditcode,Query query) {
-		IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), creditcode);
+	public R<IPage<MemberVO>> selectMemberInfo(Member member,Query query) {
+		IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), member);
 		return R.data(pages);
 	}
 

--
Gitblit v1.9.3