From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 17:13:27 +0800
Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3

---
 src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index 73835a2..5ef7bb0 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/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"

--
Gitblit v1.9.3