From cf985b57d178fad1e18b46b9b020548a90d3d915 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 11:17:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java
index 44262d8..be8b796 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java
+++ b/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;
}
--
Gitblit v1.7.1