Merge branch 'send_coupon' into user_action

peng

2 天以前 e46e620ea7afd8b18aa24dde8e3c9564355fa14f

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