From 770361cf5d70c7893ffea4f1dacac297628aea1d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 20 六月 2025 18:03:00 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zd-after

---
 main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java b/main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java
index caf15b3..8925c3b 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java
@@ -28,15 +28,15 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
-     * 鐓ょ
+     * 鐓ょid
      */
-    @TableField(value = "coal")
-    private String coal;
+    @TableField(value = "coal_id")
+    private String coalId;
     /**
      * 鐢熶骇鏁伴噺
      */
     @TableField(value = "production_quantity")
-    private Integer productionQuantity;
+    private BigDecimal productionQuantity;
     /**
      * 浜哄伐鎴愭湰
      */
@@ -61,7 +61,7 @@
      *
      */
     @TableField(value = "producer_id")
-    private String producerId;
+    private Long producerId;
     /**
      * 鐢熶骇浜�
      */

--
Gitblit v1.9.3