From 119ccc4f2bed0f07b5807e0ff1d4e00301e674bd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 18:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
index 6afc772..d90cd97 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
@@ -107,7 +107,7 @@
*/
@GetMapping("/technicianListByShopId")
@ApiOperation(value = "技师列表", tags = {"技师列表-小程序"})
- public R<TableDataInfo> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
+ public R<TableDataInfo<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
startPage();
return R.ok(getDataTable(technicianService.getTechnicianListByShopId(shopId)));
}
--
Gitblit v1.7.1