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

longz

2026-09-29 0ca3a3922d2d25df52682b2290be15135cce100e

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/VinManagementFallbackFactory.java

@@ -50,12 +50,18 @@
            }

            @Override
            public R<Long> countByFleet(Integer fleetId) {
                return R.fail("按车队统计VIN车辆数失败:" + throwable.getMessage());
            }

            @Override
            public R<BigDecimal> lockBalance(Long vinId, BigDecimal amount) {
                return R.fail("锁定VIN余额失败:" + throwable.getMessage());
            }

            @Override
            public R<BigDecimal> settleBalance(Long vinId, BigDecimal lockedAmount, BigDecimal actualAmount) {
            public R<BigDecimal> settleBalance(Long vinId, BigDecimal lockedAmount, BigDecimal actualAmount,
                                               String orderCode, String userInfo, String userName, String remark) {
                return R.fail("结算VIN余额失败:" + throwable.getMessage());
            }