From 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 11:31:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/approve/bean/dto/ApprovalInstanceDto.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/bean/dto/ApprovalInstanceDto.java b/src/main/java/com/ruoyi/approve/bean/dto/ApprovalInstanceDto.java
index ab4dced..a2df482 100644
--- a/src/main/java/com/ruoyi/approve/bean/dto/ApprovalInstanceDto.java
+++ b/src/main/java/com/ruoyi/approve/bean/dto/ApprovalInstanceDto.java
@@ -1,7 +1,10 @@
package com.ruoyi.approve.bean.dto;
import com.ruoyi.approve.pojo.ApprovalInstance;
+import com.ruoyi.basic.dto.StorageBlobDTO;
import lombok.Data;
+
+import java.util.List;
@Data
public class ApprovalInstanceDto extends ApprovalInstance {
@@ -9,4 +12,10 @@
private String approveAction;
private String approveComment;
+
+ private String createTimeEnd;
+
+ private String createTimeStart;
+
+ private List<StorageBlobDTO> storageBlobDTOs;
}
--
Gitblit v1.9.3