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 | 12 ++++++++++++
1 files changed, 12 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 79b234f..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
@@ -1,5 +1,6 @@
package com.ruoyi.business.dto;
+import com.ruoyi.basic.entity.CoalValue;
import com.ruoyi.business.entity.OfficialInventory;
import lombok.Data;
@@ -13,8 +14,19 @@
private List<Long> ids;//瑕佸悎骞剁殑姝ｅ紡搴撶殑id
+ private Integer type;
+
private String coal; //鐓ょ
private String supplierName; //渚涘簲鍟�
+ private String registrant; //鐧昏浜�
+
+ private String supplierCoal; //渚涘簲鍟� + 鐓ょ
+
+ private List<Map<String, String>> coalValues; //濯掕川鏂规瀛楁鍊�
+
+ private List<Long> exportIds;//瀵煎嚭閫変腑鐨刬d
+
+
}
--
Gitblit v1.9.3