Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-31 9b583c3ae9f78328368b2eda8899f80204ed796f

 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);
   }