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

Cui Zhi Feng

2024-09-26 d9e918ae32613a04de0b979078eba278556979c5

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

@@ -145,6 +145,9 @@
                and oi.flower_name LIKE concat('%', #{condition.flowerName},'%')
            )
        </if>
        <if test="condition.warehouseLocationCode != null and condition.warehouseLocationCode != ''">
            AND q.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')
        </if>

        ORDER BY q.create_time desc, q.payment_time desc
    </select>