From 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 19:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 53 +++++++++++++++++------------------------------------
1 files changed, 17 insertions(+), 36 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..75b870c 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -2,69 +2,50 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.device.pojo.DeviceMaintenance;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
-import java.util.Date;
@Data
-public class DeviceMaintenanceDto {
+public class DeviceMaintenanceDto extends DeviceMaintenance {
- @ApiModelProperty("璁惧淇濆吇id")
+ @Schema(description = "璁惧淇濆吇id")
private Long id;
- @ApiModelProperty("璁惧鍙拌处id")
+ @Schema(description = "璁惧鍙拌处id")
private Long deviceLedgerId;
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
private String deviceName;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private String maintenancePlanTimeReq;
-
- @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private LocalDateTime maintenancePlanTime;
-
- @ApiModelProperty("瀹為檯淇濆吇浜�")
+ @Schema(description = "瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
- @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private LocalDateTime maintenanceActuallyTime;
-
- @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private String maintenanceActuallyTimeReq;
-
- @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
+ @Schema(description = "淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+ @Schema(description = "鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
private Integer status;
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
+ @Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.UPDATE)
+ @Schema(description = "鏇存柊鏃堕棿")
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
- @TableField(fill = FieldFill.INSERT)
- private String createUser;
+ @Schema(description = "鏇存柊浜�")
+ private String updateUserName;
- @ApiModelProperty("鏇存柊浜�")
- @TableField(fill = FieldFill.UPDATE)
- private String updateUser;
-
- @ApiModelProperty("绉熸埛id")
- @TableField(fill = FieldFill.INSERT)
+ @Schema(description = "绉熸埛id")
private Long tenantId;
- @ApiModelProperty("鍒涘缓浜哄悕绉�")
+ @Schema(description = "鍒涘缓浜哄悕绉�")
private String createUserName;
}
+
--
Gitblit v1.9.3