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

sen

2025-08-18 424d9748add1a2ade5ca33e8981e5bc4e7a03ab6

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

 quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java

@@ -48,7 +48,6 @@

        List<EstimatedReceivable> estimatedReceivables = new ArrayList<>();
        for (PendingSettlementBusiness pendingSettlementBusiness : pendingSettlementBusinesses) {
            pendingSettlementBusiness.setIsCreate(1);
            ReceivableLineTruckPriceRule exactMatchingRule = ExactPricingRuleMatcher.findExactMatchingRule(receivableLineTruckPriceRules, pendingSettlementBusiness.getCustomerName(), pendingSettlementBusiness.getDepartureLocation(), pendingSettlementBusiness.getArrivalLocation(), pendingSettlementBusiness.getVehicleType());
            if (exactMatchingRule!=null) {
                //应收数据