From 4548c5045b3a5522ad14df7c939f0303c1e17587 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sat, 11 Oct 2025 19:07:29 +0800
Subject: [PATCH] ้…้€่ดน

---
 oying-system/src/main/resources/mapper/system/MerchantMapper.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/oying-system/src/main/resources/mapper/system/MerchantMapper.xml b/oying-system/src/main/resources/mapper/system/MerchantMapper.xml
index 71a7dc8..1ed3c94 100644
--- a/oying-system/src/main/resources/mapper/system/MerchantMapper.xml
+++ b/oying-system/src/main/resources/mapper/system/MerchantMapper.xml
@@ -50,10 +50,9 @@
         order by merchant_sort desc
     </select>
     <select id="findByUserId" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
+        select m.*
         from sys_merchant as m
-        left join sys_user_merchant as u on u.merchant_id = m.merchant_id
+                 left join sys_user_merchant as u on u.merchant_id = m.merchant_id
         where user_id = #{userId}
         order by m.merchant_id
     </select>

--
Gitblit v1.9.3