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 3f94bbb4d..693ca002d 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 @@ -64,18 +64,18 @@ public class EmisCommissionDtlController extends BaseController // ,"exprId","calcExpr","feeRemark","empCode","empName","createTime" // },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" + "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) @GetMapping("/list") public TableDataInfo list(EmisCommissionDtl emisCommissionDtl)