From 8c2a413d2574151a2bc762aa0779f766de48160b Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 18:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
index 79ad2ef..520af51 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
@@ -49,8 +49,7 @@
Page<Shop> page = new Page<>();
page.setCurrent(PageNum);
page.setSize(pageSize);
- IPage<Shop> shopIPage = shopMapper.selectShopList(page, shop);
- return shopIPage;
+ return shopMapper.selectShopList(page, shop);
}
@Override
@@ -102,7 +101,7 @@
@Override
public Boolean cheUserByPhone(String phone) {
- R<AppUser> r = appUserClient.getAppUserByPhone(phone);
+ R<AppUser> r = appUserClient.getAppUserByPhone1(phone);
if (R.isError(r)){
return false;
}
--
Gitblit v1.7.1