From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java | 22 ++++++++++++++++++++++
1 files changed, 22 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..91eaecf 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
@@ -87,6 +87,9 @@
@ApiModelProperty(value = "娉曚汉鐢佃瘽")
@ExcelColumn(name="娉曚汉鐢佃瘽")
private String legalPersonPhone;
+ @ApiModelProperty(value = "寰俊openId")
+ @ExcelColumn(name="寰俊openId")
+ private String openId;
@ApiModelProperty(value = "韬唤璇佸弽闈㈢収")
@ExcelColumn(name="韬唤璇佸弽闈㈢収")
@@ -122,6 +125,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 +218,10 @@
@TableField(exist = false)
private BigDecimal score;
+ @ApiModelProperty(value = "璺濈")
+ @TableField(exist = false)
+ private BigDecimal distance;
+
@ApiModelProperty(value = "搴楅摵璁块棶鏁版嵁锛氫富椤垫�昏闂噺")
@TableField(exist = false)
@@ -252,6 +268,9 @@
@ApiModelProperty(value = "浼樻儬鍒革細浼樻儬鍒搁鍙栨�绘暟")
@TableField(exist = false)
private BigDecimal couponDrawCount;
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜")
+ @TableField(exist = false)
+ private Integer goodsId;
@ApiModelProperty(value = "浼樻儬鍒革細浼樻儬鍒镐娇鐢ㄦ�绘暟(寮�)")
@TableField(exist = false)
@@ -260,6 +279,9 @@
@ApiModelProperty(value = "浼樻儬鍒革細浼樻儬鍒镐娇鐢ㄩ噾棰�(鍏�)")
@TableField(exist = false)
private BigDecimal couponUserMoney;
+ @ApiModelProperty(value = "鏌愬晢鍝佷緵璐т环(鍏�)")
+ @TableField(exist = false)
+ private BigDecimal goodsPrice;
@ApiModelProperty(value = "搴楅摵鏍囩")
--
Gitblit v1.9.3