Merge remote-tracking branch 'origin/master'

doum

16 小时以前 f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e

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

@@ -21,6 +21,9 @@
    @ApiModelProperty(value = "城市主键")
    private Integer cityId;

    @ApiModelProperty(value = "类型：1=标速达；2=极速达")
    private Integer fieldA;

    @ApiModelProperty(value = "起送里程(公里)")
    private String startDistance;