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/service/impl/MemberServiceImpl.java

@@ -45,8 +45,8 @@
   }

   @Override
   public IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,String creditcode) {
      return page.setRecords(baseMapper.selectMemberInfo(page,creditcode));
   public IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,Member member) {
      return page.setRecords(baseMapper.selectMemberInfo(page,member));
   }

   @Override