From feb2adcf8ba6e56a31faea43d6e86d5da253cd75 Mon Sep 17 00:00:00 2001 From: wujianwei <wjw@11.com> Date: 星期五, 15 八月 2025 17:25:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master --- quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java b/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java index 45cebe3..e185d47 100644 --- a/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java +++ b/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); } } -- Gitblit v1.8.0