From a495de04fcb6b4f96b7610d360d7e8877c5af426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Wed, 10 Jul 2024 17:57:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml   | 2 +-
 .../src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml     | 1 +
 .../ruoyi/web/controller/ss/SmTransactionBillController.java    | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
index 27c482d2..a66b6621 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
@@ -267,7 +267,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <include refid="updateColumns"/>
         </trim>
-        where bill_id = #{billId}
+        where bill_id = #{data.billId}
     </update>
 
     <sql id="updateColumns">
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
index bc1e22b0..f5e23ef4 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
@@ -107,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="searchCondition"/>
             and su.del_flag = '0'
         </where>
+        order by su.create_time desc
     </select>
 
     <select id="selectSmUserByUserId" parameterType="Long" resultMap="SmUserResult">
diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmTransactionBillController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmTransactionBillController.java
index 75ead02f..d522ed27 100644
--- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmTransactionBillController.java
+++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmTransactionBillController.java
@@ -165,7 +165,6 @@ public class SmTransactionBillController extends BaseController
         return success();
     }
 
-
     // 订单退款
     @PutMapping("/refund")
     @PreAuthorize("@ss.hasPermi('system:bill:refund')")