Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

 src/main/resources/mapper/partner/PartnerMapper.xml

@@ -32,6 +32,9 @@
        <if test="dto.region!=null and dto.region!=''">
            AND t.region like CONCAT('%',#{dto.region}, '%')
        </if>
        <if test="dto.isEnabled!=null">
            AND t.is_enabled = #{dto.isEnabled}
        </if>
        order by t.create_time desc
    </select>
    <select id="getCurrentPartner" resultType="com.mzl.flower.dto.response.partner.PartnerDTO"