From d56a4ae3aded7fecbecf98d33557f28dedc3abc6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 05 十二月 2022 16:57:43 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 be8b796..51c117f 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
@@ -14,7 +14,7 @@
  */
 @Data
 @ApiModel("便民服自提点")
-public class ConvenientElevatingPointVO {
+public class ConvenientElevatingPointVO implements Comparable<ConvenientElevatingPointVO>{
     /**
      * 主键id
      */
@@ -104,4 +104,12 @@
      */
     @ApiModelProperty(value = "配送商品数量")
     private Integer deliveryGoodsNum;
+
+    @ApiModelProperty(value = "提货点详细地址")
+    private String detailAddress;
+
+    @Override
+    public int compareTo(ConvenientElevatingPointVO o) {
+        return this.getDistance().compareTo(o.getDistance()); //定义你自己的排序规则
+    }
 }

--
Gitblit v1.7.1