From d346846239a8a39246c464dc634f5fd72add99ab Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 26 八月 2025 15:22:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
main-business/src/main/java/com/ruoyi/business/dto/PendingInventoryDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/dto/PendingInventoryDto.java b/main-business/src/main/java/com/ruoyi/business/dto/PendingInventoryDto.java
index cfb3036..0c6240e 100644
--- a/main-business/src/main/java/com/ruoyi/business/dto/PendingInventoryDto.java
+++ b/main-business/src/main/java/com/ruoyi/business/dto/PendingInventoryDto.java
@@ -35,6 +35,6 @@
private List<Map<String, Object>> coalResultList;//閰嶇叅璁＄畻鍣ㄧ叅绉嶄俊鎭痩ist
- private List<Map<String, Object>> fieldsResultList;//閰嶇叅璁＄畻鍣ㄦ柟妗堝瓧娈典俊鎭痩ist
+ private Map<String, Object> fieldsResultList;//閰嶇叅璁＄畻鍣ㄦ柟妗堝瓧娈典俊鎭痩ist
}
--
Gitblit v1.9.3