From 2ac14cef837ceaa5201d6266485ab672f6f3d650 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 15:08:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd_new' into sqd_new
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index d5e0aac..deea960 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -6,6 +6,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
@TableName("product_model")
@@ -29,9 +30,6 @@
@Excel(name = "浜у搧鍚嶇О")
private String productName;
- @Excel(name = "浜у搧缂栫爜")
- private String productCode;
-
/**
* 瑙勬牸鍨嬪彿
*/
@@ -50,6 +48,36 @@
@Excel(name = "鐢熶骇鐐掓満")
private String speculativeTradingName;
+ /**
+ * 浜у搧鍥剧墖
+ */
+// @Excel(name = "浜у搧鍥剧墖")
+ private String url;
+
+ /**
+ * 浜у搧楂樺害
+ */
+ @Excel(name = "浜у搧楂樺害")
+ private String height;
+
+ /**
+ * 姣忎欢鏁伴噺/鏀�
+ */
+ @Excel(name = "姣忎欢鏁伴噺/鏀�")
+ private String boxNum;
+
+ /**
+ * 鍗曚环(缇庡厓)/浠�
+ */
+ @Excel(name = "鍗曚环(缇庡厓)/浠�")
+ private String dollarPrice;
+
+ /**
+ * 鍗曚环(鍏�)/浠�
+ */
+ @Excel(name = "鍗曚环(鍏�)/浠�")
+ private String taxInclusiveUnitPrice;
+
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
@@ -62,4 +90,7 @@
@TableField(exist = false)
@Excel(name = "鍓╀綑搴撳瓨")
private BigDecimal stockQuantity;
+
+ @TableField(exist = false)
+ private LocalDateTime createTime;
}
--
Gitblit v1.9.3