新增主键替代复合主键

xin

2025-07-08 3660c62eca4ec4bf3fda22607abdf6d702f06abd

 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>
</mapper>