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 | 18 ++++++++++--------
1 files changed, 10 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 2c5da10..907f3dc 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -1,17 +1,16 @@
package com.ruoyi.approve.pojo;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
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.sales.pojo.CommonFile;
+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;
/**
* 瀹℃壒鑺傜偣琛�
@@ -32,7 +31,7 @@
private String url;
/**
- *
+ *
*/
private Long id;
@@ -130,4 +129,7 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
-}
\ No newline at end of file
+
+ @TableField(exist = false)
+ private List<StorageBlobDTO> storageBlobDTOS;
+}
--
Gitblit v1.9.3