From dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 17:56:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
new file mode 100644
index 0000000..3561c18
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -0,0 +1,32 @@
+package com.ruoyi.sales.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.ShippingInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author :yys
+ * @date : 2026/1/23 16:35
+ */
+@Data
+public class ShippingInfoDto extends ShippingInfo {
+
+ /**
+ * 瀹℃壒浜篿d鍒楄〃
+ */
+ // 瀹℃壒浜�
+ private String approveUserIds;
+
+ private String type; // 鍙戣揣绫诲瀷
+
+ @TableField(exist = false)
+ private List<String> tempFileIds;
+ @TableField(exist = false)
+ private List<CommonFile> commonFileList;
+
+}
--
Gitblit v1.9.3