From 03386a78c3a1f92efa21a6748e38c2c5d1c996d9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 10:57:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 7 ++++---
1 files changed, 4 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..069b665 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")
@@ -28,9 +29,6 @@
@TableField(exist = false)
@Excel(name = "浜у搧鍚嶇О")
private String productName;
-
- @Excel(name = "浜у搧缂栫爜")
- private String productCode;
/**
* 瑙勬牸鍨嬪彿
@@ -62,4 +60,7 @@
@TableField(exist = false)
@Excel(name = "鍓╀綑搴撳瓨")
private BigDecimal stockQuantity;
+
+ @TableField(exist = false)
+ private LocalDateTime createTime;
}
--
Gitblit v1.9.3