From 6d31d535d737ed26c4d9d61cd4e0b5483cb9b0ba Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 17 Sep 2025 19:44:00 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin

---
 oying-system/src/main/java/com/oying/modules/system/service/MerchantService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/system/service/MerchantService.java b/oying-system/src/main/java/com/oying/modules/system/service/MerchantService.java
index 5d1c847..b1b7c9d 100644
--- a/oying-system/src/main/java/com/oying/modules/system/service/MerchantService.java
+++ b/oying-system/src/main/java/com/oying/modules/system/service/MerchantService.java
@@ -56,4 +56,6 @@
     * @throws IOException /
     */
     void download(List<Merchant> all, HttpServletResponse response) throws IOException;
+
+    List<Merchant> findByUserId(Long userId);
 }

--
Gitblit v1.9.3