From 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 20:39:12 +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/controller/business/MerShopController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index 19c74a2..ee3f022 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -14,8 +14,8 @@
import com.ruoyi.system.api.domain.dto.MerEditUserDto;
import com.ruoyi.system.api.domain.dto.MerPageDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.domain.poji.shop.ShopAppointableTime;
import com.ruoyi.system.api.domain.poji.shop.ShopNonAppointableTime;
+import com.ruoyi.system.api.domain.poji.shop.TShopAppointableTime;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
@@ -258,7 +258,7 @@
@RequestMapping(value = "/confirmReservation/{id}", method = RequestMethod.POST)
@ApiOperation(value = "商户确认预约【2.0】")
public R confirmReservation(@PathVariable("id") String id) {
- ShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(id);
+ TShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(id);
if (null == shopAppointableTime) {
return R.fail("预约不存在");
}
@@ -274,7 +274,7 @@
@RequestMapping(value = "/cancelReservation", method = RequestMethod.POST)
@ApiOperation(value = "商户取消预约【2.0】")
public R cancelReservation(@RequestBody CancelReservationDto dto) {
- ShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(dto.getId());
+ TShopAppointableTime shopAppointableTime = shopAppointableTimeService.getById(dto.getId());
if (null == shopAppointableTime) {
return R.fail("预约不存在");
}
--
Gitblit v1.7.1