From 25d47cb937792b48690d5ccdd8aa06b202cd0967 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 14:35:20 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang 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