From 511ce651667f5b2284247cc60599078b86f7963f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 23 一月 2026 13:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
index c5b7cd7..1335c8a 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
@@ -127,7 +127,6 @@
private String parentCategoryId;
@ApiModelProperty(value = "鎶垫墸姣斾緥锛�0.1%~100%锛�", example = "1", hidden = true)
- @TableField(exist = false)
private BigDecimal deductRata;
@@ -193,6 +192,9 @@
@ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
@TableField(exist = false)
private List<Sku> skuList;
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜闆嗗悎")
+ @TableField(exist = false)
+ private List<Integer> idList;
@ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
@TableField(exist = false)
private List<Labels> brandList;
@@ -200,6 +202,18 @@
@ApiModelProperty(value = "鍟嗗搧SKU瑙勬牸缁�")
@TableField(exist = false)
private List<GoodsSku> goodsSkuList;
+ @ApiModelProperty(value = "渚涢姺鍟嗘暟閲�")
+ @TableField(exist = false)
+ private Long shopNum;
+ @ApiModelProperty(value = "宸茶缃緵閵峰晢鏁伴噺")
+ @TableField(exist = false)
+ private Long pricedShopNum;
+ @ApiModelProperty(value = "shopId" )
+ @TableField(exist = false)
+ private Integer shopId;
+ @ApiModelProperty(value = "鍟嗗渚涜揣浠�" )
+ @TableField(exist = false)
+ private BigDecimal shopPrice;
}
--
Gitblit v1.9.3