Merge remote-tracking branch 'origin/master'

doum

10 小时以前 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 server/services/src/main/java/com/doumee/dao/vo/PriceCalculateVO.java

@@ -35,6 +35,12 @@
    @ApiModelProperty("距离(km)")
    private BigDecimal distance;

    @ApiModelProperty("标速达预计时长(小时，上取整)")
    private Integer standardHours;

    @ApiModelProperty("极速达预计时长(小时，上取整)")
    private Integer urgentHours;

    @ApiModelProperty("天数")
    private Integer days;
}