From 4275b293cfc7779a20ccea30b2f773aff0fe06db Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 27 八月 2025 13:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
main-business/src/main/java/com/ruoyi/business/entity/ProductionMaster.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 aadb2ed..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;
/**
* 浜哄伐鎴愭湰
*/
--
Gitblit v1.9.3