From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/resources/mapper/system/UserMerchantMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/system/UserMerchantMapper.xml b/oying-system/src/main/resources/mapper/system/UserMerchantMapper.xml
index b820327..30bd758 100644
--- a/oying-system/src/main/resources/mapper/system/UserMerchantMapper.xml
+++ b/oying-system/src/main/resources/mapper/system/UserMerchantMapper.xml
@@ -2,8 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.oying.modules.system.mapper.UserMerchantMapper">
<resultMap id="BaseResultMap" type="com.oying.modules.system.domain.UserMerchant">
- <id column="merchant_id" property="merchantId"/>
- <id column="user_id" property="userId"/>
+ <id column="manager_id" property="managerId"/>
+ <result column="merchant_id" property="merchantId"/>
+ <result column="user_id" property="userId"/>
<result column="role_type" property="roleType"/>
<result column="permissions" property="permissions"/>
<result column="create_by" property="createBy"/>
@@ -13,7 +14,7 @@
</resultMap>
<sql id="Base_Column_List">
- merchant_id, user_id, role_type, permissions, create_by, create_time, update_by, update_time
+ manager_id, merchant_id, user_id, role_type, permissions, create_by, create_time, update_by, update_time
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -33,4 +34,4 @@
</where>
order by user_id desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3