From 31e23deb9ae71263fb59fcd82c26b22c9cdfc3d4 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期六, 14 六月 2025 15:51:14 +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/Production.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 2465357..231294a 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
@@ -28,6 +28,11 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
+ * 鐢熶骇涓昏〃ID
+ */
+ @TableField(value = "production_master_id")
+ private Long productionMasterId;
+ /**
* 鐓ょID
*/
@TableField(value = "coal_id")
@@ -37,11 +42,6 @@
*/
@TableField(value = "coal")
private String coal;
- /**
- * 鐑��
- */
- @TableField(value = "calorific_value")
- private Integer calorificValue;
/**
* 鐢熶骇鏁伴噺
*/
@@ -78,6 +78,11 @@
@TableField(value = "producer")
private String producer;
/**
+ * 鐢熶骇浜篒D
+ */
+ @TableField(value = "producer_id")
+ private String producerId;
+ /**
* 鐢熶骇鏃ユ湡
*/
@TableField(value = "production_date")
--
Gitblit v1.9.3