From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/resources/mapper/payment/OrderSettlementMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderSettlementMapper.xml b/src/main/resources/mapper/payment/OrderSettlementMapper.xml
index 5a75e50..05ec5ba 100644
--- a/src/main/resources/mapper/payment/OrderSettlementMapper.xml
+++ b/src/main/resources/mapper/payment/OrderSettlementMapper.xml
@@ -26,7 +26,7 @@
<if test="condition.userName != null and condition.userName != ''">
AND (si.name LIKE CONCAT('%', #{condition.userName}, '%') OR pi.name LIKE CONCAT('%', #{condition.userName}, '%'))
</if>
- ORDER BY s.create_time desc
+ ORDER BY s.create_time desc, userName
</select>
<select id="getUserIncome" resultType="java.math.BigDecimal">
--
Gitblit v1.9.3