Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-29 1f649d3a2a7b631b71d16bcc046c3c6c32c2ecbf

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java

@@ -86,4 +86,25 @@
     */
    @ApiModelProperty("已提货数量")
    private Long alreadyGoodsNum;

    /**
     * 距离手机定位距离
     */
    @ApiModelProperty("距离手机定位距离")
    private Double distance;

    /**
     * 配送订单数量
     */
    @ApiModelProperty(value = "配送订单数量")
    private Integer deliveryOrderNum;

    /**
     * 配送商品数量
     */
    @ApiModelProperty(value = "配送商品数量")
    private Integer deliveryGoodsNum;

    @ApiModelProperty(value = "提货点详细地址")
    private String detailAddress;
}