From dd470a03e64db4757148df1265533476352837c8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 五月 2026 17:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 6 +++++-
1 files changed, 5 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..8c0dc07 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;
@@ -36,6 +37,9 @@
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
+ @Excel(name = "浜у搧缂栫爜")
+ private String productCode;
+
/**
* 鍗曚綅
*/
--
Gitblit v1.9.3