From 474ddd0b76f343b09038e6f60e2826684d5eecd2 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 08 五月 2026 13:32:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 1e21583..cae6632 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -5,12 +5,13 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@TableName("product_model")
-public class ProductModel {
+public class ProductModel implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,6 +36,10 @@
*/
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
+
+ @Excel(name = "浜у搧缂栫爜")
+ @TableField("product_code")
+ private String productCode;
/**
* 鍗曚綅
@@ -74,4 +79,10 @@
@Schema(description = "椤堕儴鐖朵骇鍝乮d")
@TableField(exist = false)
private Long topProductParentId;
+
+ /**
+ * 搴撳瓨閲�
+ */
+ @Schema(description = "搴撳瓨閲�")
+ private BigDecimal stockInventory;
}
--
Gitblit v1.9.3