From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java
index b250170..c32412a 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java
@@ -24,9 +24,14 @@
* @param shopId
* @return
*/
- List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(@Param("userId") Long userId,
+ List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(
@Param("shopId") Long shopId,
@Param("status") Integer status);
+ List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(
+ @Param("shopId") Long shopId,
+ @Param("status") Integer status,@Param("phone")String phone,
+ @Param("name")String name,
+ @Param("serviceMode")Integer serviceMode);
IPage<TechnicianSubscribeVO> getTechnicianSubscribeByUser(@Param("page") Page<TechnicianSubscribe> page, @Param("userId") Long userId,
@Param("status") Integer status);
}
--
Gitblit v1.7.1