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/pojo/DeviceMaintenance.java |   45 ++++++++++++++++++++++-----------------------
 1 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index cbf8dbf..b635e5f 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -4,8 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -14,31 +13,31 @@
 
 @Data
 @TableName("device_maintenance")
-@ApiModel("璁惧淇濆吇璁板綍")
+@Schema(name = "璁惧淇濆吇璁板綍")
 public class DeviceMaintenance {
 
-    @ApiModelProperty("璁惧淇濆吇id")
+    @Schema(description = "璁惧淇濆吇id")
     private Long id;
 
-    @ApiModelProperty("璁惧鍙拌处id")
+    @Schema(description = "璁惧鍙拌处id")
     private Long deviceLedgerId;
 
-    @ApiModelProperty("淇濆吇浠诲姟id")
+    @Schema(description = "淇濆吇浠诲姟id")
     private Long maintenanceTaskId;
 
-    @ApiModelProperty(value = "棰戞")
+    @Schema(description = "棰戞")
     private String frequencyType;
 
-    @ApiModelProperty(value = "棰戞璇︽儏")
+    @Schema(description = "棰戞璇︽儏")
     private String frequencyDetail;
 
-    @ApiModelProperty(value = "涓嬫鎵ц鏃堕棿")
+    @Schema(description = "涓嬫鎵ц鏃堕棿")
     private LocalDateTime nextExecutionTime;
 
-    @ApiModelProperty(value = "鏈�鍚庢墽琛屾椂闂�")
+    @Schema(description = "鏈�鍚庢墽琛屾椂闂�")
     private LocalDateTime lastExecutionTime;
 
-    @ApiModelProperty(value = "璁惧绫荤洰")
+    @Schema(description = "璁惧椤圭洰")
     private String machineryCategory;
 
 
@@ -46,53 +45,53 @@
 
     private String deviceModel;
 
-    @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
+    @Schema(description = "璁″垝淇濆吇鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime maintenancePlanTime;
 
-    @ApiModelProperty("瀹為檯淇濆吇浜�")
+    @Schema(description = "瀹為檯淇濆吇浜�")
     private String maintenanceActuallyName;
 
-    @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
+    @Schema(description = "瀹為檯淇濆吇鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime maintenanceActuallyTime;
 
-    @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
+    @Schema(description = "淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
     private String maintenanceResult;
 
-    @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
+    @Schema(description = "鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
     private Integer status;
 
-    @ApiModelProperty("鍒涘缓鏃堕棿")
+    @Schema(description = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("鏇存柊鏃堕棿")
+    @Schema(description = "鏇存柊鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
-    @ApiModelProperty("鍒涘缓浜�")
+    @Schema(description = "鍒涘缓浜�")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
-    @ApiModelProperty("鏇存柊浜�")
+    @Schema(description = "鏇存柊浜�")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
 
-    @ApiModelProperty("绉熸埛id")
+    @Schema(description = "绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
-    @ApiModelProperty("棰嗙敤澶囦欢ids")
+    @Schema(description = "棰嗙敤澶囦欢ids")
     private String sparePartsIds;
 
-    @ApiModelProperty("浣跨敤澶囦欢鍒楄〃")
+    @Schema(description = "浣跨敤澶囦欢鍒楄〃")
     @TableField(exist = false)
     private List<SparePartUse> sparePartsUseList;
 

--
Gitblit v1.9.3