From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期二, 20 五月 2025 23:48:08 +0800 Subject: [PATCH] 修改文件上传类型限制 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientElevatingPointVO.java | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 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..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 */ @@ -30,17 +30,12 @@ * 社区id */ @ApiModelProperty("社区id") - private Long communityId; + private String communityId; /** * 社区名称 */ @ApiModelProperty("社区名称") private String communityName; - /** - * 所属地区 - */ - @ApiModelProperty("所属地区") - private String region; /** * 提货点地址 */ @@ -91,4 +86,30 @@ */ @ApiModelProperty("已提货数量") private Long alreadyGoodsNum; + + /** + * 距离手机定位距离 + */ + @ApiModelProperty("距离手机定位距离") + private Double distance; + + /** + * 配送订单数量 + */ + @ApiModelProperty(value = "配送订单数量") + private Integer deliveryOrderNum; + + /** + * 配送商品数量 + */ + @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