Merge remote-tracking branch 'origin/master'

doum

17 小时以前 417e33605dda0f28366a1d6e13c41198a156e3a7

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

@@ -302,4 +302,12 @@
    @TableField(exist = false)
    private   List<ProductLabel> productList;


    @ApiModelProperty(value = "所属城市编码（关联areas)", example = "1")
    @TableField(exist = false)
    private Integer cityId;

    @ApiModelProperty(value = "所属省份编码（关联areas)", example = "1")
    @TableField(exist = false)
    private Integer provinceId;
}