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

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -2235,6 +2235,7 @@ public class KwtWaybillOrderV1Service {
         queryParams.put("wOrderId", subtask.getWOrderId());
         queryParams.put("lAddressId", lAddressId);
         queryParams.put("passStatus", Global.NUMERICAL_ONE);
+        queryParams.put("unit", subtask.getUnit());
         WaybillCountVo waybillCount = waybillOrderV1Dao.findTicketCountByAddress(queryParams);
         //地址总委派量
         BigDecimal entrustAmount = addresses.stream().map(KwtWaybillOrderAddress::getEntrustAmount).reduce(BigDecimal.ZERO, BigDecimal::add);