Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java

@@ -348,7 +348,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getLossWeight()));
             rowData.add(new ExcelData(dto.getLossPrice().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
-            rowData.add(new ExcelData(dto.getDriverFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getDriverFreight()==null?null:dto.getDriverFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceServiceFeeRate().toString()+ "%"));
             rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));