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/Goods.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 240d1c2..c5b7cd7 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
@@ -74,10 +74,9 @@
@ExcelColumn(name="鍝佺墝缂栫爜锛堝叧鑱攍abels琛級")
private Integer brandId;
- @ApiModelProperty(value = "灞曠ず浠锋牸", example = "1")
+ @ApiModelProperty(value = "灞曠ず浠锋牸(鍑哄巶浠�)", example = "1")
@ExcelColumn(name="灞曠ず浠锋牸")
private BigDecimal price;
-
@ApiModelProperty(value = "鍒濆閿�閲�", example = "1")
@ExcelColumn(name="鍒濆閿�閲�")
private Integer salenum;
@@ -127,13 +126,21 @@
@ExcelColumn(name="涓�绾у垎绫�")
private String parentCategoryId;
- @ApiModelProperty(value = "鎶垫墸姣斾緥锛�0.1%~100%锛�", example = "1")
+ @ApiModelProperty(value = "鎶垫墸姣斾緥锛�0.1%~100%锛�", example = "1", hidden = true)
+ @TableField(exist = false)
private BigDecimal deductRata;
+
+ @ApiModelProperty(value = "sku閲嶉噺", hidden = true)
+ @TableField(exist = false)
+ private BigDecimal weight;
@ApiModelProperty(value = "sku閲戦", hidden = true)
@TableField(exist = false)
private BigDecimal skuPrice;
+ @ApiModelProperty(value = "sku鏄剧ず浠锋牸", hidden = true)
+ @TableField(exist = false)
+ private BigDecimal showPrice;
@ApiModelProperty(value = "sku鎬婚噾棰�", hidden = true)
@TableField(exist = false)
@@ -142,6 +149,10 @@
@ApiModelProperty(value = "skuId", hidden = true)
@TableField(exist = false)
private Integer skuId;
+
+ @ApiModelProperty(value = "sku鍥剧墖", hidden = true)
+ @TableField(exist = false)
+ private String skuImg;
@ApiModelProperty(value = "鍟嗗搧杞挱鍥�", example = "1")
@TableField(exist = false)
@@ -175,11 +186,16 @@
@ApiModelProperty(value = "tab鍒囨崲鐘舵��;1鍏ㄩ儴锛�2锛屽凡鍞絼锛�3鍥炴敹")
@TableField(exist = false)
private Integer tabStatus;
-
+ @ApiModelProperty(value = "鍗曚綅")
+ @TableField(exist = false)
+ private String unitName;
@ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
@TableField(exist = false)
private List<Sku> skuList;
+ @ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
+ @TableField(exist = false)
+ private List<Labels> brandList;
@ApiModelProperty(value = "鍟嗗搧SKU瑙勬牸缁�")
@TableField(exist = false)
--
Gitblit v1.9.3