Merge remote-tracking branch 'origin/master'

doum

2026-04-21 3539d67072a5fd179bd44385ebefce0d1a6e8cb4

 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;