Merge remote-tracking branch 'origin/master'

doum

3 天以前 f4e09a3f13bbf63b166c3a149497a93a9fd43bc5

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Member.java

@@ -149,6 +149,9 @@
    @ExcelColumn(name="sharingCode")
    private String sharingCode;

    @ApiModelProperty(value = "绑定商铺主键 shop:id 分销人")
    private Integer bindShopId;

    @ApiModelProperty(value = "文件地址全路径")
    @TableField(exist = false)
    private String imgFullUrl;