From 871139771f47e806a50c468ad633031c9cf037c7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 13 Oct 2024 09:26:30 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/web/emis/EmisSettleBillController.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
index f43ad4c27..68c044f11 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
@@ -552,13 +552,13 @@ public class EmisSettleBillController extends BaseController
                 voMap.put("freight", billItem.getWaybillDetail().getFreight().stripTrailingZeros().toPlainString());
 
                 String feeRemark="";
-                if(!StringUtils.isEmpty(billItem.getWaybillDetail().getRemark())){
-                    feeRemark=billItem.getWaybillDetail().getRemark();
+                if(!StringUtils.isEmpty(billItem.getWaybillDetail().getFeeRemark())){
+                    feeRemark=billItem.getWaybillDetail().getFeeRemark();
                 }
 
-                if(!StringUtils.isEmpty(billItem.getWaybillDetail().getFeeRemark())){
-                    feeRemark=feeRemark+" "+billItem.getWaybillDetail().getFeeRemark();
-                }
+//                if(!StringUtils.isEmpty(billItem.getWaybillDetail().getFeeRemark())){
+//                    feeRemark=feeRemark+" "+billItem.getWaybillDetail().getFeeRemark();
+//                }