Merge remote-tracking branch 'origin/master'

doum

昨天 b613bb368d4e678b42d25e94397d0aab3e213438

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/ShopInfoResponse.java

@@ -68,4 +68,13 @@
    @ApiModelProperty(value = "法人电话")
    private String legalPersonPhone;

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

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

    @ApiModelProperty(value = "省市区")
    private Areas areas;

}