From 31bb16817c3702b4515a05e010dffa8b490c83b6 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 11:25:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hysn' into hysn
---
src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
index bd9ebd9..4424b1c 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
@@ -1,15 +1,39 @@
package com.ruoyi.approve.vo;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.sales.pojo.CommonFile;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.List;
@Data
public class ApproveGetAndUpdateVo {
+
+ private List<String> tempFileIds;
+
+ /**
+ * 鎶ラ攢閲戦
+ */
+ private BigDecimal price;
//瀹℃壒id
@NotBlank(message = "娴佺▼缂栧彿涓嶈兘涓虹┖")
private String id;
//鐢宠浜嬬敱
@NotBlank(message = "鐢宠浜嬬敱涓嶈兘涓虹┖")
private String approveReason;
+
+ private String approveUserIds;
+
+ private Long approveUser;
+
+ private String approveTime;
+
+ private Integer approveStatus;
+ /**
+ * 瀹℃壒绫诲瀷
+ */
+ private Integer approveType;
}
--
Gitblit v1.9.3