From a08dce3de307ce138396db5fe7274ead2ef5c573 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 17:12:08 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
index 6cd3316..e276703 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@@ -16,6 +17,11 @@
@ApiModelProperty("璁惧鍚嶇О")
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
+
+
+ @ApiModelProperty("璁惧淇濆吇閲戦")
+ @Excel(name = "璁惧淇濆吇閲戦")
+ private BigDecimal maintenancePrice;
@Excel(name = "瑙勬牸鍨嬪彿")
@ApiModelProperty("瑙勬牸鍨嬪彿")
@@ -37,7 +43,7 @@
@Excel(name = "淇濆吇缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+ @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
@Excel(name = "鐘舵��")
private String status;
--
Gitblit v1.9.3