From d404864e22a98cf1a81177041a264ed31aa56222 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 13 十月 2026 08:14:59 +0800
Subject: [PATCH] fix: 更新查询逻辑以支持产品型号的批号匹配,调整配置文件以更改文件路径和数据库设置

---
 src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
index 0614da2..809e4e6 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
@@ -21,6 +21,10 @@
     @Schema(description = "瑙勬牸鍨嬪彿")
     private String deviceModel;
 
+    @Schema(description = "椤圭洰")
+    @Excel(name = "椤圭洰")
+    private String machineryCategory;
+
     @Excel(name = "璁″垝淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
     @Schema(description = "璁″垝淇濆吇鏃ユ湡")
     private Date maintenancePlanTime;

--
Gitblit v1.9.3