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

zxl

1 天以前 c4786844ef75025cd27cc3833a0f7cd86ad80781

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