Merge remote-tracking branch 'origin/master'

doum

昨天 dbddcc6d450759987c0af44ccab8cd5269ae08e8

 server/dmmall_service/src/main/java/com/doumee/dao/system/vo/CountDataVO.java

@@ -24,4 +24,6 @@
    private BigDecimal price1;
    @ApiModelProperty(value = "统计维度名称")
    private String name;
    @ApiModelProperty(value = "统计维度时间名称")
    private String dateStr;
}