From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java
index 1d54ed7..e795683 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java
@@ -57,7 +57,7 @@
shopAppointableTimeList.forEach(shopAppointableTime -> {
ShopAppointableTimeListVo shopAppointableTimeListVo = new ShopAppointableTimeListVo();
shopAppointableTimeListVo.setId(shopAppointableTime.getId());
- shopAppointableTimeListVo.setAppointableTime(shopAppointableTime.getAppointableTime());
+ shopAppointableTimeListVo.setAppointableTime(shopAppointableTime.getAppointmentTime());
shopAppointableTimeListVo.setStatus(shopAppointableTime.getStatus());
Member member = remoteMemberService.getMember(shopAppointableTime.getUserId()).getData();
shopAppointableTimeListVo.setUserName(member.getRealName());
--
Gitblit v1.7.1