From aa8652cc420f84bd3e543ebe611a563e852d4725 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期日, 08 九月 2024 16:26:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/resources/mapper/payment/OrderMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index f46921d..880740c 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -201,7 +201,7 @@
</foreach>
</if>
- ORDER BY q.partner_id, q.warehouse_name, q.warehouse_location_code, q.create_time desc, q.payment_time desc
+ ORDER BY q.partner_id DESC, q.warehouse_id, q.warehouse_location_id, q.create_time desc, q.payment_time desc
</select>
<select id="getSupplierSaleNum" resultType="com.mzl.flower.dto.response.payment.SupplierNumDTO">
--
Gitblit v1.9.3