From d3ee63dc365fbcb964a469150c9a84717f171eda Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 十二月 2025 13:44:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx
---
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index cae0715..de440ca 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -13,7 +13,6 @@
@ApiModelProperty("璁惧淇濆吇id")
-
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
@@ -41,7 +40,7 @@
private String maintenanceActuallyTimeReq;
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
- private Integer maintenanceResult;
+ private String maintenanceResult;
@ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
private Integer status;
--
Gitblit v1.9.3