From f4e70436bb93ab6cc7e2b8c27afa9a5978371855 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 16:31:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 335dd3a..3997459 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -27,6 +27,9 @@
@Excel(name = "浜у搧鍚嶇О")
private String productName;
+ @Excel(name = "浜у搧缂栫爜")
+ private String productCode;
+
/**
* 瑙勬牸鍨嬪彿
*/
@@ -39,6 +42,12 @@
@Excel(name = "鍗曚綅")
private String unit;
+ /**
+ * 鐢熶骇鐐掓満
+ */
+ @Excel(name = "鐢熶骇鐐掓満")
+ private String speculativeTradingName;
+
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
--
Gitblit v1.9.3