Merge remote-tracking branch 'origin/master'

doum

8 天以前 f45bcaf01cd2c96e66b08d3f9b7287aa5b4cdab2

 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;