Merge remote-tracking branch 'origin/master'

doum

17 小时以前 7b223c4dfdc960a6172bac87e47ab1b86b90ba1a

 server/dmmall_service/src/main/java/com/doumee/dao/web/dto/shop/ShopDataStatisticsDTO.java

@@ -18,11 +18,11 @@
    private String shopName;

    @ApiModelProperty(value = "商家核销数")
    private Integer shopCouponUseCount;
    private long shopCouponUseCount;

    @ApiModelProperty(value = "商家粉丝数")
    private Integer shopFansCount;
    private long shopFansCount;

    @ApiModelProperty(value = "商家新鲜事")
    private Integer shopNewCount;
    private long shopNewCount;
}