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/ShopGoodsRelation.java | 8 ++++++++
1 files changed, 8 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..a513aa9 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
@@ -55,6 +55,9 @@
@ApiModelProperty(value = "鍟嗘埛涓婚敭锛坰hop涓婚敭锛�", example = "1")
@ExcelColumn(name="鍟嗘埛涓婚敭锛坰hop涓婚敭锛�")
private Integer shopId;
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜锛坓oods涓婚敭锛�", example = "1")
+ @ExcelColumn(name="鍟嗗搧缂栫爜锛坓oods涓婚敭锛�")
+ private Integer goodsId;
@ApiModelProperty(value = "鍟嗗搧SKU ID锛坓oods_sku涓婚敭锛�", example = "1")
@ExcelColumn(name="鍟嗗搧SKU ID锛坓oods_sku涓婚敭锛�")
@@ -64,4 +67,9 @@
@ExcelColumn(name="渚涜揣浠�")
private BigDecimal price;
+ @ApiModelProperty(value = "鍚敤0 绂佺敤1", example = "1")
+ @ExcelColumn(name="鍚敤0 绂佺敤1")
+ private Integer status;
+
+
}
--
Gitblit v1.9.3