From 4318746ee88ad53e00341df1a0395058bebc40fa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 25 六月 2025 14:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/service/CustomerService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/CustomerService.java b/framework/src/main/java/cn/lili/modules/lmk/service/CustomerService.java
index 1f6eb4e..112ee70 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/CustomerService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/CustomerService.java
@@ -34,7 +34,7 @@
      * @param id 浼氬憳id
      * @return 鐢ㄦ埛VO
      */
-    MemberVO getMember(String id);
+    Result getMember(String id);
 
 
     /**

--
Gitblit v1.8.0