From f4e09a3f13bbf63b166c3a149497a93a9fd43bc5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 13 一月 2026 18:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/ShopGoodsRelation.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/ShopGoodsRelation.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/ShopGoodsRelation.java
index cf373ba..593640d 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/ShopGoodsRelation.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/ShopGoodsRelation.java
@@ -64,4 +64,9 @@
     @ExcelColumn(name="渚涜揣浠�")
     private BigDecimal price;
 
+    @ApiModelProperty(value = "鍚敤0 绂佺敤1", example = "1")
+    @ExcelColumn(name="鍚敤0 绂佺敤1")
+    private Integer status;
+
+
 }

--
Gitblit v1.9.3