From 454ee66716ec76821e78ab1f056f39fca6f29a71 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 05 十二月 2024 13:38:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
index fb1ef6c..4143b59 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianSubscribeController.java
@@ -38,7 +38,7 @@
*/
@GetMapping("/list")
@ApiOperation(value = "预约列表", notes = "预约列表", tags = {"小程序-个人中心-门店管理-预约列表"})
- public TableDataInfo list(@ApiParam(value = "状态") @RequestParam Integer status,
+ public TableDataInfo<TechnicianSubscribeVO> list(@ApiParam(value = "状态") @RequestParam Integer status,
@ApiParam(value = "门店id") @RequestParam Long shopId) {
startPage();
List<TechnicianSubscribeVO> list = technicianSubscribeService
@@ -75,12 +75,12 @@
}
/**
- * 跟新技师预约状态
+ * 更新技师预约状态
*
* @param status
*/
@PutMapping("/updateStatus")
- @ApiOperation(value = "跟新技师预约状态", notes = "跟新技师预约状态", tags = {"后台-技师预约管理-跟新技师预约状态"})
+ @ApiOperation(value = "更新技师预约状态", notes = "更新技师预约状态", tags = {"后台-技师预约管理-更新技师预约状态"})
public R<Void> updateStatus(@ApiParam @RequestParam Integer status, @ApiParam @RequestParam Long subscribeId) {
boolean update = technicianSubscribeService.update(new LambdaUpdateWrapper<TechnicianSubscribe>()
.eq(TechnicianSubscribe::getId, subscribeId)
@@ -94,7 +94,7 @@
@GetMapping("/home/list")
@ApiOperation(value = "列表", notes = "列表", tags = {"小程序-个人中心-我的预约"})
- public TableDataInfo homelist(@ApiParam(value = "状态 0=待服务，1=已服务，2=已取消 4 已到期") @RequestParam Integer status) {
+ public TableDataInfo<TechnicianSubscribeVO> homelist(@ApiParam(value = "状态 0=待服务，1=已服务，2=已取消 4 已到期") Integer status) {
startPage();
List<TechnicianSubscribeVO> list = technicianSubscribeService
.getTechnicianSubscribeByUser(SecurityUtils.getUserId(), status);
--
Gitblit v1.7.1