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/mapper/shop/ShopAppointableTimeMapper.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopAppointableTimeMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopAppointableTimeMapper.java
index ef6a876..dc9a59a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopAppointableTimeMapper.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopAppointableTimeMapper.java
@@ -5,7 +5,7 @@
import com.ruoyi.shop.domain.dto.ShopAppointableTimeListDto;
import com.ruoyi.shop.domain.vo.MyAppointmentListVo;
import com.ruoyi.shop.domain.vo.ShopAppointableTimeListVo;
-import com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime;
+import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -14,7 +14,7 @@
* @author zhibing.pu
* @Date 2025/5/26 15:13
*/
-public interface ShopAppointableTimeMapper extends BaseMapper<ShopAppointableTime> {
+public interface ShopAppointableTimeMapper extends BaseMapper<TShopAppointableTime> {
/**
@@ -35,7 +35,7 @@
* @param dto
* @return
*/
- List<ShopAppointableTime> getShopAppointableTimeList(Page<ShopAppointableTimeListVo> page, @Param("item") ShopAppointableTimeListDto dto);
+ List<TShopAppointableTime> getShopAppointableTimeList(Page<ShopAppointableTimeListVo> page, @Param("item") ShopAppointableTimeListDto dto);
/**
--
Gitblit v1.7.1