From 733b9e6837365d2817d7e8a0005b2c167c18f77e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 19 六月 2025 17:58:48 +0800
Subject: [PATCH] 1.生产加工  2.煤种id优化

---
 main-business/src/main/java/com/ruoyi/business/entity/Production.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 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 d79ea0f..d760a80 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
@@ -8,7 +8,7 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
 
 /**
  * 鐢熶骇鏄庣粏琛� 瀹炰綋绫�
@@ -28,25 +28,20 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
+     * 鐢熶骇涓昏〃ID
+     */
+    @TableField(value = "production_master_id")
+    private Long productionMasterId;
+    /**
      * 鐓ょID
      */
     @TableField(value = "coal_id")
     private Long coalId;
     /**
-     * 鐓ょ
-     */
-    @TableField(value = "coal")
-    private String coal;
-    /**
-     * 鐑��
-     */
-    @TableField(value = "calorific_value")
-    private Integer calorificValue;
-    /**
      * 鐢熶骇鏁伴噺
      */
     @TableField(value = "production_quantity")
-    private Integer productionQuantity;
+    private BigDecimal productionQuantity;
     /**
      * 浜哄伐鎴愭湰
      */
@@ -78,8 +73,13 @@
     @TableField(value = "producer")
     private String producer;
     /**
+     * 鐢熶骇浜篒D
+     */
+    @TableField(value = "producer_id")
+    private String producerId;
+    /**
      * 鐢熶骇鏃ユ湡
      */
     @TableField(value = "production_date")
-    private Date productionDate;
+    private LocalDate productionDate;
 }
\ No newline at end of file

--
Gitblit v1.9.3