From 4e09b531d890649d598e48fad32fd1810e9840ec Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 14 May 2025 09:50:19 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisCommissionDtlController.java | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
index 1d05fd1f3..04b37587a 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
@@ -16,6 +16,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.utils.WaybillHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,19 +62,21 @@ public class EmisCommissionDtlController extends BaseController
     @JacksonFilter(include= {
             "id","feeType","money","billMonth", "billType","billCode","quoteId","quoteName"
             ,"exprId","calcExpr","feeRemark","empCode","empName","createTime"
-            ,"waybillDetail.sendSiteName","waybillDetail.dispatchUnderlingSiteName"
-            ,"waybillDetail.sendCountryName","waybillDetail.receiveCountryName"
-            ,"waybillDetail.paymentType","waybillDetail.sendDate"
-            ,"waybillDetail.sendCompany","waybillDetail.transLineTypeName"
-            ,"waybillDetail.productTypeName","waybillDetail.timeType"
-            ,"waybillDetail.sendName","waybillDetail.parcelQty"
-            ,"waybillDetail.billWeight","waybillDetail.totalVolume"
-            ,"waybillDetail.volumeWeight","waybillDetail.settlementWeight"
-            ,"waybillDetail.billFee","waybillDetail.realFee"
-            ,"waybillDetail.freight","waybillDetail.paymentStatus"
-            ,"waybillDetail.feeRemark","waybillDetail.remark"
-            ,"waybillDetail.payee","waybillDetail.salesmen"
     },value= EmisCommissionDtl.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @JacksonFilter(include= {
+            "sendSiteName","dispatchUnderlingSiteName"
+            ,"sendCountryName","receiveCountryName"
+            ,"paymentType","sendDate"
+            ,"sendCompany","transLineTypeName"
+            ,"productTypeName","timeType"
+            ,"sendName","parcelQty"
+            ,"billWeight","totalVolume"
+            ,"volumeWeight","settlementWeight"
+            ,"billFee","realFee"
+            ,"freight","paymentStatus"
+            ,"feeRemark","remark"
+            ,"payee","salesmen"
+    },value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @GetMapping("/list")
     public TableDataInfo list(EmisCommissionDtl emisCommissionDtl)
     {