From c477506a6d672f71c6353608f3cf3424d8026790 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 13 四月 2026 18:18:40 +0800
Subject: [PATCH] refactor(approve): 优化审批流程ID生成逻辑
---
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 8df1411..96c2f86 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -1,6 +1,5 @@
package com.ruoyi.device.dto;
-
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +15,13 @@
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
+ private Long deviceLedgerId;
+
+ @ApiModelProperty("璁惧鍖哄煙id")
+ private Long areaId;
+
+ @ApiModelProperty("璁惧鍖哄煙鍚嶇О")
+ private String areaName;
@ApiModelProperty("璁惧鍚嶇О")
private String deviceName;
@@ -26,6 +31,8 @@
@ApiModelProperty("鎶ヤ慨鏃堕棿")
private Date repairTime;
+
+ private String repairTimeStr;
@ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
@@ -38,6 +45,8 @@
@ApiModelProperty("缁翠慨鏃堕棿")
private Date maintenanceTime;
+
+ private String maintenanceTimeStr;
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
@@ -64,7 +73,4 @@
@ApiModelProperty("绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
-
-
}
-
--
Gitblit v1.9.3