From 357c778a545822c9fe396b795f64e52bc28ef403 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 八月 2025 15:38:59 +0800
Subject: [PATCH] Merge branch 'pim_zss'
---
src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
index 5835645..3748847 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
@@ -7,17 +7,23 @@
@Data
public class ApproveProcessVO {
- //閮ㄩ棬id
- // private Long deptId;
- //閮ㄩ棬鍚嶇О
- @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
- private String deptName;
- //瀹℃壒浜� ids
- // private String approverIds;
- //瀹℃壒浜哄悕绉�
- @NotBlank(message = "瀹℃壒浜轰笉鑳戒负绌�")
- private String approverNames;
- //瀹℃壒浜嬬敱
- @NotBlank(message = "11")
+ private Long id;
+
+
+ private Long approveDeptId;
+
+ private String approveTime;
+
+ // 鐢宠浜�
+ private Long approveUser;
+
+ // 瀹℃壒浜�
+ private String approveUserIds;
+
private String approveReason;
+
+ /**
+ * 瀹℃壒绫诲瀷
+ */
+ private Integer approveType;
}
--
Gitblit v1.9.3