From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
index 2f0e29c..809e4e6 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
@@ -1,7 +1,7 @@
package com.ruoyi.device.execl;
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;
@@ -13,39 +13,43 @@
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
@Excel(name = "瑙勬牸鍨嬪彿")
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String deviceModel;
+ @Schema(description = "椤圭洰")
+ @Excel(name = "椤圭洰")
+ private String machineryCategory;
+
@Excel(name = "璁″垝淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
- @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
+ @Schema(description = "璁″垝淇濆吇鏃ユ湡")
private Date maintenancePlanTime;
- @ApiModelProperty("瀹為檯淇濆吇浜�")
+ @Schema(description = "瀹為檯淇濆吇浜�")
@Excel(name = "瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
- @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
+ @Schema(description = "瀹為檯淇濆吇鏃ユ湡")
@Excel(name = "瀹為檯淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
private LocalDateTime maintenanceActuallyTime;
- @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
+ @Schema(description = "淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
@Excel(name = "淇濆吇缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
+ @Schema(description = "鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
@Excel(name = "鐘舵��")
private String status;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@Excel(name = "褰曞叆鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
private Date createTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
// @Excel(name = "褰曞叆浜�")
private String createUser;
--
Gitblit v1.9.3