From 74f9e1f4f009907d4f8ebda80f522a25a25f87f2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 11 三月 2026 10:32:59 +0800
Subject: [PATCH] fix:同步(安全培训-筛选优化)

---
 src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
index 18f6614..2d9ae4e 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
@@ -2,34 +2,47 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.sales.pojo.CommonFile;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
 @Data
 public class ApproveProcessVO {
-
+    /**
+     * 涓存椂鏂囦欢id鍒楄〃
+     */
     private List<String> tempFileIds;
-
+    /**
+     * 瀹℃壒娴佺▼id
+     */
     private Long id;
 
-
+    private String approveId;
+    /**
+     * 瀹℃壒閮ㄩ棬id
+     */
     private Long approveDeptId;
-
+    /**
+     * 瀹℃壒鏃堕棿
+     */
     private String approveTime;
-
+    /**
+     * 鐢宠浜篿d
+     */
     // 鐢宠浜�
     private Long approveUser;
-
+    /**
+     * 瀹℃壒浜篿d鍒楄〃
+     */
     // 瀹℃壒浜�
     private String approveUserIds;
-
+    /**
+     * 瀹℃壒鐞嗙敱
+     */
     private String approveReason;
 
     @Excel(name = "寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd",width = 30)
@@ -52,4 +65,29 @@
      * 瀹℃壒绫诲瀷
      */
     private Integer approveType;
+     /**
+     * 璁惧鎶ヤ慨id
+     */
+    private Long deviceRepairId;
+     /**
+     * 鎶ヤ慨閲戦
+     */
+    private BigDecimal maintenancePrice;
+    /**
+     * 鏄惁鍏ュ簱瀹℃牳閫氳繃
+     */
+    @ApiModelProperty(value = "鏄惁鍏ュ簱瀹℃牳閫氳繃")
+    private boolean inventoryReview;
+
+    /**
+     * 鍏ュ簱绫诲瀷锛堝悎鏍�/涓嶅悎鏍硷級
+     */
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    private String storageType;
+
+    /**
+     * 鍏ュ簱id
+     */
+    @ApiModelProperty(value = "鍏ュ簱id")
+    private Long recordId;
 }

--
Gitblit v1.9.3