From f5624a59380db70633eebe3612e2d3c703012b41 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 08 一月 2026 17:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index de440ca..560af37 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -42,7 +42,7 @@
     @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
     private String maintenanceResult;
 
-    @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+    @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
     private Integer status;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")

--
Gitblit v1.9.3