From ca788dcbd73c5c8665b45da7ff4a0b1d92196b2c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 27 八月 2025 09:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

---
 main-business/src/main/java/com/ruoyi/business/entity/Production.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/main-business/src/main/java/com/ruoyi/business/entity/Production.java b/main-business/src/main/java/com/ruoyi/business/entity/Production.java
index d760a80..0220378 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/Production.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/Production.java
@@ -76,10 +76,22 @@
      * 鐢熶骇浜篒D
      */
     @TableField(value = "producer_id")
-    private String producerId;
+    private Long producerId;
     /**
      * 鐢熶骇鏃ユ湡
      */
     @TableField(value = "production_date")
     private LocalDate productionDate;
+
+    /**
+     * 鐓ゆ枡绫诲瀷(1-鎴愬搧 2-鍘熸枡)
+     */
+    @TableField(value = "type")
+    private Integer type;
+
+    /**
+     * 鐘舵�侊紙1-寰呮帓浜� 2-鎺掍骇涓� 3-宸叉帓浜э級
+     */
+    @TableField(value = "status")
+    private Integer status;
 }
\ No newline at end of file

--
Gitblit v1.9.3