From 25a638e0d5f282d26ff9da47e5b7aa5c9c1603d4 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 23 十月 2024 18:34:20 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0 --- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java index ead6fe8..6e6d519 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java @@ -59,7 +59,7 @@ //判断当前业务是否已经出车 DriverWork driverWork = driverWorkMapper.queryNewWork(uid, type, 1); if(null != driverWork){ - return ResultUtil.error(language == 1 ? "该业务已经出车,无法取消设置" : language == 2 ? "This service has been deployed and cannot be canceled" : "Cette entreprise est déjà hors du véhicule et ne peut pas être désactivée"); + return ResultUtil.error(language == 1 ? "该业务已经出车,无法取消设置" : language == 2 ? "The driver is on the way, no way to cancel." : "Le chauffeur est en route, pas moyen de l’annuler."); } this.deleteById(query.getId()); } -- Gitblit v1.7.1