From 49c3ba90feb4f14fb2f0c911aadeb865bb07f26f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 01 六月 2026 13:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆马铃薯pro' into dev_新疆马铃薯pro
---
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index 2294338..f4ebc48 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -22,6 +22,9 @@
@Schema(description = "璁惧鍙拌处id")
private Long deviceLedgerId;
+ @Schema(description = "璁惧鍖哄煙ID")
+ private Long areaId;
+
@Schema(description = "淇濆吇浠诲姟id")
private Long maintenanceTaskId;
@@ -37,7 +40,7 @@
@Schema(description = "鏈�鍚庢墽琛屾椂闂�")
private LocalDateTime lastExecutionTime;
- @Schema(description = "璁惧绫荤洰")
+ @Schema(description = "璁惧椤圭洰")
private String machineryCategory;
--
Gitblit v1.9.3