From 2c1415e6c7bf6837cb24768770b10821853a6341 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 14 一月 2026 17:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java
index 805e067..0530b95 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java
@@ -122,6 +122,15 @@
@ApiModelProperty(value = "绉垎绱")
@ExcelColumn(name="绉垎绱")
private BigDecimal totalIntegral;
+
+ @ApiModelProperty(value = "鍙彁鎴愰噾棰�")
+ @ExcelColumn(name="鍙彁鎴愰噾棰�")
+ private BigDecimal amount;
+
+ @ApiModelProperty(value = "绱鍙彁鎴愰噾棰�")
+ @ExcelColumn(name="绱鍙彁鎴愰噾棰�")
+ private BigDecimal totalAmount;
+
@ApiModelProperty(value = "鐘舵��0姝ｅ父 1绂佺敤", example = "1")
@ExcelColumn(name="鐘舵��0姝ｅ父 1绂佺敤")
private Integer status;
@@ -206,6 +215,10 @@
@TableField(exist = false)
private BigDecimal score;
+ @ApiModelProperty(value = "璺濈")
+ @TableField(exist = false)
+ private BigDecimal distance;
+
@ApiModelProperty(value = "搴楅摵璁块棶鏁版嵁锛氫富椤垫�昏闂噺")
@TableField(exist = false)
--
Gitblit v1.9.3