Merge remote-tracking branch 'origin/master'

doum

昨天 b613bb368d4e678b42d25e94397d0aab3e213438

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

@@ -189,6 +189,14 @@
    @ApiModelProperty(value = "营业结束时间")
    private String brandStory;

    @ApiModelProperty(value = "小程序码地址")
    private String programCode;


    @ApiModelProperty(value = "专属海报码")
    private String posterImgCode;


    @ApiModelProperty(value = "头像")
    @TableField(exist = false)
    private String memberImgurl;