Merge branch 'dev' into send_coupon

peng

2 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

 framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java

@@ -30,5 +30,14 @@
    @Select("select * from li_member ${ew.customSqlSegment}")
    IPage<MemberVO> pageByMemberVO(IPage<MemberVO> page, @Param(Constants.WRAPPER) Wrapper<Member> queryWrapper);

    @Select("select m.*,s.store_name as bindStoreName " +
            "from li_member m " +
            "LEFT JOIN li_store s on m.share_store_id = s.id " +
            " ${ew.customSqlSegment}")
    IPage<MemberVO> pageByMemberVOAndBindStore(IPage<MemberVO> page, @Param(Constants.WRAPPER) Wrapper<Member> queryWrapper);

    @Select("select * from li_member ${ew.customSqlSegment}")
    List<MemberVO> exportMember(@Param(Constants.WRAPPER) Wrapper<Member> queryWrapper);

    MemberVO getVoById(@Param("id") String id);
}