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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

 src/main/resources/mapper/customer/CustomerMapper.xml

@@ -40,6 +40,9 @@
        <if test="dto.partnerUserId != null and dto.partnerUserId != ''">
            and c.partner_user_id = #{dto.partnerUserId}
        </if>
        <if test="dto.isEnabled!=null">
            AND c.is_enabled = #{dto.isEnabled}
        </if>
        order by c.create_time desc
    </select>
    <select id="getCurrentCustomer" resultType="com.mzl.flower.dto.response.customer.CustomerDTO"