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

gongzuming

2024-09-26 e468d0b56e1c33f047bee84ca8c9a142c769fe16

 src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml

@@ -65,7 +65,7 @@
        <if test="endDate != null">
            AND q.create_time &lt;= #{endDate}
        </if>
        order by q.create_time desc
        order by q.create_time desc, oi.flower_name, oi.flower_level
    </select>

    <select id="getSupplierStatisticsByTime"