Merge branch 'dev' into send_coupon

peng

2 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

 framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java

@@ -106,6 +106,9 @@
    @ApiModelProperty(value = "黑名单id")
    private String blackId;

    @ApiModelProperty(value = "绑定商店名")
    private String bindStoreName;

    public MemberVO(Member member) {
        BeanUtil.copyProperties(member, this);
    }