From ded338d0bafa5594b275edb81a8f69ea4446c37c Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 06 一月 2026 15:02:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
index 6cd3316..2f0e29c 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
@@ -37,7 +37,7 @@
@Excel(name = "淇濆吇缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+ @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
@Excel(name = "鐘舵��")
private String status;
--
Gitblit v1.9.3