Merge remote-tracking branch 'origin/master'

Administrator

2022-07-13 798ab07db6464f24e353dcdf8397506ab246c91d

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