Merge branch 'dev_spt' into dev

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementLogisticsService.java

@@ -202,7 +202,7 @@ public class KwpSettlementLogisticsService {
         List<TableTop> tableTops = new ArrayList<>();
         TableTop tableTop = new TableTop();
         //总
-        settlementReq.setStatus(null);
+        settlementReq.setStatus(0);
         settlementLogisticsStatusCountVos.setAllCount(settlementLogisticsMapper.getCountList(settlementReq));
         tableTop.setName("全部").setValue(settlementReq.getStatus()).setTotal(Math.toIntExact(settlementLogisticsStatusCountVos.getAllCount()));
         tableTops.add(tableTop);