From 3fde768475f750d2abcac045341422c954778ede Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 13 Oct 2024 09:24:50 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/web/emis/EmisSettleBillController.java   | 2 +-
 .../java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 f65ef855e..f43ad4c27 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
@@ -673,7 +673,7 @@ public class EmisSettleBillController extends BaseController
                 if(!StringUtils.isEmpty(feeItemRemark)){
                     feeItemRemark="费用项:"+StringUtils.removeEnd(feeItemRemark,"|");
                 }
-                feeRemark=feeRemark+","+feeItemRemark;
+//                feeRemark=feeRemark+","+feeItemRemark;
                 feeRemark=StringUtils.removeEnd(feeRemark,",");
 
                 voMap.put("feeRemark", feeRemark);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java
index a54d526e8..5cf2bcfc9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java
@@ -19,6 +19,8 @@ import com.xdadan.erp.common.core.domain.TreeEntity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
 
 
@@ -76,4 +78,8 @@ public class EmisTmsCostFee extends BaseEntity
     /* 确认网点代码 */
     private String confirmSiteCode;
 
+    // --- 扩展
+    // 关联单号
+    private List<EmisTmsCostFeeRel> billRelList;
+
 }