From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java
index 546a4f7..67aa25b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java
@@ -1,12 +1,8 @@
 package com.panzhihua.service_dangjian.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.panzhihua.common.model.dtos.partybuilding.NewFightResourceSharingDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
 import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -61,4 +57,11 @@
 
     R editData(NewFightConvenientMerchantVO item);
 
+
+    R selectUserList(String communityId,String phoneOrname);
+
+    R selectUserListB(String communityId,String phoneOrname);
+
+
+    R selectUserBind(String communityId, String userId);
 }

--
Gitblit v1.7.1