From 392366ea36a839e5d0ea05968e6da31cd53a9ee6 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 八月 2025 14:32:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

---
 basic-server/src/main/java/com/ruoyi/basic/entity/CoalPlan.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/entity/CoalPlan.java b/basic-server/src/main/java/com/ruoyi/basic/entity/CoalPlan.java
index 0c097ff..958edbc 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/entity/CoalPlan.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/entity/CoalPlan.java
@@ -27,6 +27,12 @@
     @TableField(value = "plan")
     private String plan;
     /**
+     * 鐓よ川鏂规瀛楁id
+     */
+    @TableField(value = "field_ids")
+    private String fieldIds;
+
+    /**
      * 鐓よ川鏂规瀛楁
      */
     @TableField(value = "coal_fields")

--
Gitblit v1.9.3