Merge remote-tracking branch 'origin/dev' into dev

peng

3 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

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

@@ -29,4 +29,6 @@

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

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