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

wujianwei

2025-08-15 feb2adcf8ba6e56a31faea43d6e86d5da253cd75

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

@@ -83,7 +83,7 @@
                estimatedReceivable.setEstimatedAmount(exactMatchingRule2.getFreight());
                estimatedReceivable.setCurrency("人民币");
                estimatedReceivable.setIsConfirmed(1);
                estimatedReceivable.setFeeType(0);
                estimatedReceivable.setFeeType(1);
                estimatedReceivables.add(estimatedReceivable);
            }
        }