From 92ff484325b9af3afd081ec079f74fbc6dd3fea8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 27 十月 2025 15:43:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/export/AssetAdMaterialSporadicSettlementImport.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/export/AssetAdMaterialSporadicSettlementImport.java b/ruoyi-system/src/main/java/com/ruoyi/system/export/AssetAdMaterialSporadicSettlementImport.java
index 9779f73..351a8b2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/export/AssetAdMaterialSporadicSettlementImport.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/export/AssetAdMaterialSporadicSettlementImport.java
@@ -63,10 +63,9 @@
     private BigDecimal unitPrice;
 
     @Excel(name = "金额（元）", width = 20)
-    private BigDecimal totalAmount;
+    private BigDecimal amount;
 
     @Excel(name = "备注", width = 20)
     private String remark;
-
 
 }

--
Gitblit v1.7.1