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/IMemberService.java

@@ -41,6 +41,6 @@
    * @return
    */
   IPage<MemberVO> selectMemberPage(IPage<MemberVO> page, MemberVO member);
   IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,String creditcode);
   IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,Member member);
   void importmember(List<memberExcel> data, Boolean isCovered);
}