合併代碼

puzhibing

2024-09-27 a1cd941559fd24812b48eb41913c6fe269139c73

合併代碼

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -692,7 +692,7 @@
                //提前结束定时任务
                scheduler.shutdown();
            }
        }, 5, 300, TimeUnit.SECONDS);
        }, 5000, 300, TimeUnit.MILLISECONDS);
        return AjaxResult.success();
    }