From ca788dcbd73c5c8665b45da7ff4a0b1d92196b2c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 27 八月 2025 09:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

---
 main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java b/main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java
index 0d0e2c2..819a3ca 100644
--- a/main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java
+++ b/main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java
@@ -14,6 +14,8 @@
 
     private List<Long> ids;//瑕佸悎骞剁殑姝e紡搴撶殑id
 
+    private Integer type;
+
     private String coal; //鐓ょ
 
     private String supplierName; //渚涘簲鍟�
@@ -24,4 +26,7 @@
 
     private List<Map<String, String>> coalValues; //濯掕川鏂规瀛楁鍊�
 
+    private List<Long> exportIds;//瀵煎嚭閫変腑鐨刬d
+
+
 }

--
Gitblit v1.9.3