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

peng

14 小时以前 4372e6406222ce6b33f8c1c0703b460d39b5814e

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

@@ -100,6 +100,12 @@
    @ApiModelProperty(value = "客户标签列表")
    private List<CustomerTagVO> customerTagList;

    /**
     * 为null则不在黑名单内
     */
    @ApiModelProperty(value = "黑名单id")
    private String blackId;

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