From 392366ea36a839e5d0ea05968e6da31cd53a9ee6 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 八月 2025 14:32:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 d381090..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,12 +14,19 @@
private List<Long> ids;//瑕佸悎骞剁殑姝ｅ紡搴撶殑id
+ private Integer type;
+
private String coal; //鐓ょ
private String supplierName; //渚涘簲鍟�
+ private String registrant; //鐧昏浜�
+
private String supplierCoal; //渚涘簲鍟� + 鐓ょ
- private List<CoalValue> coalValues; //濯掕川鏂规瀛楁鍊�
+ private List<Map<String, String>> coalValues; //濯掕川鏂规瀛楁鍊�
+
+ private List<Long> exportIds;//瀵煎嚭閫変腑鐨刬d
+
}
--
Gitblit v1.9.3