From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对(未明确) 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检,抽检的话是抽多少百分比 6.供应商管理东西太少了,没有资质文件啊这些东西(是不是可以参考pro) 7.采购审批把人从李莹莹改成龙红星

---
 src/main/java/com/ruoyi/basic/pojo/ProductModel.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 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..dc7201c 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,17 +37,14 @@
     @Excel(name = "瑙勬牸鍨嬪彿")
     private String model;
 
+    @Excel(name = "浜у搧缂栫爜")
+    private String productCode;
+
     /**
      * 鍗曚綅
      */
     @Excel(name = "鍗曚綅")
     private String unit;
-
-    /**
-     * 鐢熶骇鐐掓満
-     */
-    @Excel(name = "鐢熶骇鐐掓満")
-    private String speculativeTradingName;
 
     @Schema(description = "绉熸埛ID")
     @TableField(fill = FieldFill.INSERT)

--
Gitblit v1.9.3