Merge remote-tracking branch 'origin/master'

luodangjia

2024-04-28 94e9dc3adb80baf6e1d7d56e54a93917996bc339

 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();