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/dto/CoalPlanDto.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/CoalPlanDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/CoalPlanDto.java
index 7282531..27f0302 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/CoalPlanDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/CoalPlanDto.java
@@ -3,6 +3,12 @@
import com.ruoyi.basic.entity.CoalPlan;
import lombok.Data;
+import java.util.List;
+
@Data
public class CoalPlanDto extends CoalPlan {
+
+ private List<String> fields;
+
+ private String searchAll;
}
--
Gitblit v1.9.3