From a77decc3df26449414639082293e2ee6722e643c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 15:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/approve/pojo/ApproveNode.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
index 300cc32..907f3dc 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -1,14 +1,16 @@
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;
/**
* 瀹℃壒鑺傜偣琛�
@@ -16,9 +18,20 @@
*/
@Data
@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;
@@ -113,4 +126,10 @@
private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ @TableField(exist = false)
+ private List<StorageBlobDTO> storageBlobDTOS;
+}
--
Gitblit v1.9.3