Merge remote-tracking branch 'origin/master'

tangzy

2021-11-05 98f8d438a976d73e7c4f6434efc8867ebe2a07a5

 src/main/java/org/springblade/modules/member/mapper/MemberMapper.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.member.mapper;

import org.apache.ibatis.annotations.Param;
import org.springblade.modules.member.entity.Member;
import org.springblade.modules.member.vo.MemberVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,5 +40,5 @@
    * @return
    */
   List<MemberVO> selectMemberPage(IPage page, MemberVO member);
   List<MemberVO> selectMemberInfo(IPage page,String creditcode);
   List<MemberVO> selectMemberInfo(IPage page,@Param("deptId") String deptId);
}