From 64f45c75ea93911b9841bf00bb4c436cd294be3a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 18:30:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/business/model/Goods.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Goods.java b/server/service/src/main/java/com/doumee/dao/business/model/Goods.java
index 180afe4..65b3b70 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Goods.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Goods.java
@@ -117,6 +117,13 @@
@ExcelColumn(name="鍚嶇О鎷奸煶棣栧瓧姣�")
private String shortPinyin;
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜锛堝叧鑱攂ase_goods琛級")
+ private Integer goodsId;
+
+ @ApiModelProperty(value = "鍒涘缓绫诲埆锛�0=鑷缓锛�1=鎷夊彇")
+ private Integer type;
+
+
@ApiModelProperty(value = "鍓嶇紑璺緞")
@TableField(exist = false)
private String prefixUrl;
@@ -157,6 +164,18 @@
@TableField(exist = false)
private BigDecimal ePrice;
+ @ApiModelProperty(value = "base鎸囧浠凤紙鍏冿級", example = "1")
+ @TableField(exist = false)
+ private BigDecimal baseZdPrice;
+
+ @ApiModelProperty(value = "base鍏ユ墜浠锋牸锛堝厓锛�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal basePrice;
+
+ @ApiModelProperty(value = "base鍔犱环绯绘暟", example = "1")
+ @TableField(exist = false)
+ private BigDecimal basePriceRate;
+
}
--
Gitblit v1.9.3