From e9a7cddce776382916e975402986144a88899ac5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 14 五月 2026 18:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 server/services/src/main/java/com/doumee/dao/vo/ShopDetailVO.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/vo/ShopDetailVO.java b/server/services/src/main/java/com/doumee/dao/vo/ShopDetailVO.java
index 12f7721..f67e6d0 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/ShopDetailVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/ShopDetailVO.java
@@ -127,6 +127,9 @@
     @ApiModelProperty(value = "闂ㄥ簵璇勫垎")
     private BigDecimal score;
 
+    @ApiModelProperty(value = "閰嶉�佽窛绂�")
+    private BigDecimal deliveryRange;
+
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     private Date createTime;
 
@@ -172,4 +175,19 @@
 
     @ApiModelProperty(value = "闂ㄥ簵澶村儚锛堝叏璺緞锛�")
     private String shopAvatar;
+
+    @ApiModelProperty(value = "灏卞湴瀵勫瓨鍒嗘垚鍗犳瘮(%)", example = "5.5")
+    private Double localDeposit;
+
+    @ApiModelProperty(value = "寮傚湴瀛樹欢鍒嗘垚鍗犳瘮(%)", example = "5.5")
+    private Double remoteDeposit;
+
+    @ApiModelProperty(value = "寮傚湴鍙栦欢鍒嗘垚鍗犳瘮(%)", example = "5.5")
+    private Double remoteTake;
+
+    @ApiModelProperty(value = "闂ㄥ簵鐗堟湰绫诲瀷锛�0=姝e紡鐗堟湰锛�1=鍙樻洿鐗堟湰", example = "0")
+    private Integer versionType;
+
+    @ApiModelProperty(value = "鍏宠仈姝e紡鐗堟湰闂ㄥ簵涓婚敭")
+    private Integer relationShopId;
 }

--
Gitblit v1.9.3