Merge branch 'refs/heads/master' into xin

xin

2025-09-17 6d31d535d737ed26c4d9d61cd4e0b5483cb9b0ba

 oying-system/src/main/resources/mapper/system/MerchantMapper.xml

@@ -49,4 +49,12 @@
        </where>
        order by merchant_sort desc
    </select>
    <select id="findByUserId" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from sys_merchant as m
        left join sys_user_merchant as u on u.merchant_id = m.merchant_id
        where user_id = #{userId}
        order by m.merchant_id
    </select>
</mapper>