From 80939d3c23637db6345bb732283c1eb6234dbfac Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期二, 23 六月 2026 17:45:56 +0800 Subject: [PATCH] fix:发货状态变为已发货需两个条件，一是发货审批通过，而是发货出库审批通过 --- src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java b/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java index 8daf720..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,8 @@ package com.ruoyi.inspectiontask.dto; +import com.ruoyi.basic.dto.StorageBlobDTO; +import com.ruoyi.basic.dto.StorageBlobVO; import com.ruoyi.inspectiontask.pojo.InspectionTask; -import com.ruoyi.sales.pojo.CommonFile; import lombok.Data; import java.util.List; @@ -16,9 +17,12 @@ // // private List<StorageAttachment> attachments; - private List<String> tempFileIds; - private List<CommonFile> commonFileList; //鐢熶骇涓� - private List<CommonFile> commonFileListAfter; //鐢熶骇鍚� - private List<CommonFile> commonFileListBefore; //鐢熶骇鍓� + 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