From c9e784140d837cb27a4f93935b08bbb739d47c8e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 13 八月 2025 17:08:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 02e9f45..18c624c 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -3,9 +3,11 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.sales.pojo.CommonFile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,6 +26,9 @@
@TableId(type = IdType.AUTO)
private Long id;
+ @TableField(exist = false)
+ private List<CommonFile> commonFileList;
+
/**
* 娴佺▼缂栧彿
*/
--
Gitblit v1.9.3