From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java b/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
index f92bde5..a207cde 100644
--- a/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
+++ b/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
@@ -1,7 +1,7 @@
package com.ruoyi.inspectiontask.dto;
import com.ruoyi.basic.dto.StorageBlobDTO;
-import com.ruoyi.basic.pojo.StorageAttachment;
+import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.inspectiontask.pojo.InspectionTask;
import lombok.Data;
@@ -10,11 +10,19 @@
@Data
public class InspectionTaskDto extends InspectionTask {
- private List<StorageBlobDTO> storageBlobDTO;
- private List<StorageBlobDTO> beforeProduction;
- private List<StorageBlobDTO> afterProduction;
- private List<StorageBlobDTO> productionIssues;
+// private List<StorageBlobDTO> storageBlobDTO;
+// private List<StorageBlobDTO> beforeProduction;
+// private List<StorageBlobDTO> afterProduction;
+// private List<StorageBlobDTO> productionIssues;
+//
+// private List<StorageAttachment> attachments;
- private List<StorageAttachment> attachments;
+ private List<StorageBlobDTO> commonFileListDTO; //鐢熶骇涓�
+ private List<StorageBlobDTO> commonFileListAfterDTO; //鐢熶骇鍚�
+ private List<StorageBlobDTO> commonFileListBeforeDTO; //鐢熶骇鍓�
+
+ private List<StorageBlobVO> commonFileListVO; //鐢熶骇涓�
+ private List<StorageBlobVO> commonFileListAfterVO; //鐢熶骇鍚�
+ private List<StorageBlobVO> commonFileListBeforeVO; //鐢熶骇鍓�
}
--
Gitblit v1.9.3