From f57064d2fa563ee4cfeeccd715850ba8b8aa4f60 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 18 五月 2026 09:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
index 9d16e4d..caf5c1a 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
@@ -2,7 +2,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -11,48 +11,64 @@
@Data
public class DeviceRepairExeclDto {
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
- @ApiModelProperty("璁惧鍨嬪彿")
+ @Schema(description = "璁惧鍨嬪彿")
@Excel(name = "璁惧鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
+ @Schema(description = "椤圭洰")
+ @Excel(name = "椤圭洰")
+ private String machineryCategory;
+
+ @Schema(description = "鎶ヤ慨鏃堕棿")
@Excel(name = "鎶ヤ慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date repairTime;
- @ApiModelProperty("鎶ヤ慨浜�")
+ @Schema(description = "鎶ヤ慨浜�")
@Excel(name = "鎶ヤ慨浜�")
private String repairName;
- @ApiModelProperty("鎶ヤ慨鍐呭")
+ @Schema(description = "鎶ヤ慨鍐呭")
@Excel(name = "鎶ヤ慨鍐呭")
private String remark;
- @ApiModelProperty("缁翠慨浜�")
+ @Schema(description = "缁翠慨浜�")
@Excel(name = "缁翠慨浜�")
private String maintenanceName;
- @ApiModelProperty("缁翠慨鏃堕棿")
+ @Schema(description = "缁翠慨鏃堕棿")
@Excel(name = "缁翠慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDateTime maintenanceTime;
- @ApiModelProperty("缁翠慨缁撴灉")
+ @Schema(description = "缁翠慨缁撴灉")
@Excel(name = "缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "楠屾敹浜�")
+ @Excel(name = "楠屾敹浜�")
+ private String acceptanceName;
+
+ @Schema(description = "楠屾敹鏃堕棿")
+ @Excel(name = "楠屾敹鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime acceptanceTime;
+
+ @Schema(description = "楠屾敹澶囨敞")
+ @Excel(name = "楠屾敹澶囨敞")
+ private String acceptanceRemark;
+
+ @Schema(description = "鐘舵��")
@Excel(name = "鐘舵��")
private String statusStr;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@Excel(name = "褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDateTime createTime;
// @Excel(name = "褰曞叆浜�")
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
private String createUser;
--
Gitblit v1.9.3