From a98454d581018eeee3ca8e7f9b381bee6608eb2d Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 16 六月 2026 11:59:27 +0800
Subject: [PATCH] feat: 增强电量记录汇总功能，优化时间范围处理及合并逻辑
---
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
index 2e35584..3fedf2c 100644
--- a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
+++ b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -44,6 +44,10 @@
@Schema(description = "璁惧id")
private Long taskId;
+ @Schema(description = "淇濆吇浜�")
+ @Excel(name = "淇濆吇浜�")
+ private String maintenancePerson;
+
@Schema(description = "棰戞")
@Excel(name = "棰戞")
private String frequencyType;
@@ -58,8 +62,8 @@
@Schema(description = "鏈�鍚庢墽琛屾椂闂�")
private LocalDateTime lastExecutionTime;
- @Schema(description = "鏄惁婵�娲�")
- private boolean isActive;
+ @Schema(description = "鏄惁婵�娲�, 1=鍚敤, 0=鍋滅敤")
+ private Integer isActive;
@Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
--
Gitblit v1.9.3