From c93fc713fedb68cc96f6f29e0442d949b44b7caa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 四月 2026 17:37:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/approve/pojo/ApproveNode.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
index de3a255..7c35578 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -1,28 +1,44 @@
package com.ruoyi.approve.pojo;
-import java.io.Serializable;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
/**
* 瀹℃壒鑺傜偣琛�
* @TableName approve_node
*/
@Data
-public class ApproveNode implements Serializable {
+@TableName("approve_node")
+@Schema
+public class ApproveNode{
+
+
+ @Schema(description = "闄勪欢id")
+ @TableField(exist = false)
+ private List<String> tempFileIds;
+
+ @TableField(exist = false)
+ @Schema(description = "闄勪欢鍒楄〃")
+ private String url;
+
/**
- *
+ *
*/
private Long id;
/**
- * 瀹℃壒id
+ * 瀹℃壒缂栧彿
*/
- private Long approveProcessId;
+ private String approveProcessId;
/**
* 瀹℃壒鑺傜偣椤哄簭
@@ -33,6 +49,11 @@
* 瀹℃壒鑺傜偣鐢ㄦ埛鍚嶅瓧
*/
private String approveNodeUser;
+
+ /**
+ * 瀹℃壒鑺傜偣鐢ㄦ埛id
+ */
+ private Long approveNodeUserId;
/**
* 瀹℃壒鑺傜偣鏃堕棿
@@ -48,19 +69,49 @@
@TableField(exist = false)
private Boolean isFirst;
+
+ /**
+ * 鏄惁涓烘渶鍚庝竴姝�
+ */
@TableField(exist = false)
private Boolean isLast;
/**
+ * 鏄惁涓哄綋鍓嶅鏍歌妭鐐�
+ */
+ @TableField(exist = false)
+ private Boolean isShen = false;
+
+ /**
* 绉熸埛id
*/
- @TableField(fill = FieldFill.INSERT)
+// @TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
* 鍒犻櫎鏍囪:0姝ｅ父锛�1鍒犻櫎
*/
private Integer deleteFlag;
+
+ /**
+ * 鍏ュ簱鐢ㄦ埛id
+ */
+ private Long createUser;
+
+ /**
+ * 鍏ュ簱鏃堕棿
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼鑰�
+ */
+ private Long updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ private LocalDateTime updateTime;
/**
* 瀹℃壒鑺傜偣鎷掔粷鍘熷洜
@@ -75,4 +126,10 @@
private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private List<StorageBlobDTO> storageBlobDTOS;
+}
--
Gitblit v1.9.3