Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 8da7ca5f5a5466c76b0d0abe23c7935e13e09136

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

@@ -30,17 +30,12 @@
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Long communityId;
    private String communityId;
    /**
     * 社区名称
     */
    @ApiModelProperty("社区名称")
    private String communityName;
    /**
     * 所属地区
     */
    @ApiModelProperty("所属地区")
    private String region;
    /**
     * 提货点地址
     */
@@ -91,4 +86,22 @@
     */
    @ApiModelProperty("已提货数量")
    private Long alreadyGoodsNum;

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

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

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