From 94e9dc3adb80baf6e1d7d56e54a93917996bc339 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 28 四月 2024 11:21:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CounsellingInfoController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CounsellingInfoController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CounsellingInfoController.java
index b3e423d..45ffed8 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CounsellingInfoController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CounsellingInfoController.java
@@ -798,7 +798,7 @@
             return new SuccessResponseData<>(counsellingOrderReservation);
         }catch (Exception ex){
             log.error("咨询预约服务异常",ex.getStackTrace());
-            throw new ServiceException("当前时间段已预约,请选择其他时间段!");
+            throw new ServiceException("当前时间段已在进行预约,请稍后再试!");
         }finally {
             if(tryLock){
                 lock.unlock();

--
Gitblit v1.7.1