From a76e2318dd2731ff713df6e262396a9175d029f7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 09:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
index 363448d..e51fe67 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
@@ -32,7 +32,7 @@
      * @param shop 瀹炰綋瀵硅薄
      * @return Integer
      */
-    Integer create(Shop shop);
+    Integer create(Shop shop) throws Exception;
 
     /**
      * 涓婚敭鍒犻櫎
@@ -198,11 +198,10 @@
 
     /**
      * 鎴戠殑瀹㈡埛淇℃伅
-     * @param request
      * @param shopId
      * @return
      */
-    List<MyCustomerResponse> myCustomer(MyCustomerRequest request, Integer shopId);
+    PageData<Member> myCustomer(PageWrap<MyCustomerRequest> pageWrap, Integer shopId);
 
     /**
      * 閿�鍞槑缁�
@@ -216,4 +215,7 @@
     String setGoodsPrice(Shop shop);
 
     PageData<ShopMoneyVO>  findPageMoney(PageWrap<Shop> pageWrap);
+
+
+    void logOut(String token,Integer shopId);
 }

--
Gitblit v1.9.3