From 4d2dda710968035fa52e69dea47525985674422b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 21 一月 2026 17:18:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java |    6 ++++++
 1 files changed, 6 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 91eaecf..3b14490 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
@@ -271,6 +271,12 @@
     @ApiModelProperty(value = "鍟嗗搧缂栫爜")
     @TableField(exist = false)
     private Integer  goodsId;
+    @ApiModelProperty(value = "宸茶缃环鏍间骇鍝佹暟閲�")
+    @TableField(exist = false)
+    private Long  pricedGoodsNum;
+    @ApiModelProperty(value = "鍟嗗搧鎬婚噺")
+    @TableField(exist = false)
+    private Long  goodsNum;
 
     @ApiModelProperty(value = "浼樻儬鍒革細浼樻儬鍒镐娇鐢ㄦ�绘暟(寮�)")
     @TableField(exist = false)

--
Gitblit v1.9.3