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 | 5 -----
1 files changed, 0 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 d35f0f6..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,11 +28,6 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
- * 鐓ょ
- */
- @TableField(value = "coal")
- private String coal;
- /**
* 鐓ょid
*/
@TableField(value = "coal_id")
--
Gitblit v1.9.3