From 0c022a90326d9e7afbfd816c789f7bd3ac848e06 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 08 一月 2026 15:58:20 +0800
Subject: [PATCH] 修改添加发货信息接口

---
 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index ebc2dea..83affb7 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -4,14 +4,12 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.Api;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import nonapi.io.github.classgraph.json.Id;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -24,6 +22,10 @@
 
     @ApiModelProperty("璁惧鍙拌处id")
     private Long deviceLedgerId;
+    @ApiModelProperty("璁惧鍚嶇О")
+    private String deviceName;
+    @ApiModelProperty("璁惧鍨嬪彿")
+    private String deviceModel;
 
     @ApiModelProperty("鎶ヤ慨鏃堕棿")
     private Date repairTime;
@@ -45,7 +47,7 @@
     @ApiModelProperty("缁翠慨缁撴灉")
     private String maintenanceResult;
 
-    @ApiModelProperty("鐘舵�� 0 寰呯淮淇� 1瀹岀粨")
+    @ApiModelProperty("鐘舵��:0瀹℃牳涓�,1瀹℃牳閫氳繃,2瀹℃牳澶辫触,3缁翠慨涓�,4缁翠慨閫氳繃,5缁翠慨澶辫触")
     private Integer status;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")
@@ -71,6 +73,8 @@
     @ApiModelProperty("绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
-
-
+    @ApiModelProperty("缁翠慨浠锋牸")
+    private BigDecimal maintenancePrice;
+    @ApiModelProperty("瀹℃壒浜篿d")
+    private Integer approverId;
 }

--
Gitblit v1.9.3