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 | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
index afcf58f..7c35578 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -1,22 +1,37 @@
package com.ruoyi.approve.pojo;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-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;
@@ -54,13 +69,23 @@
@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;
/**
@@ -101,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