From ba5fb9cec090e0cf8ba32d0714f5d9a4430081b4 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 01 十一月 2024 16:27:08 +0800
Subject: [PATCH] merge

---
 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index a889c58..45f9f74 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -120,8 +120,8 @@
         1 as type,
         title,
         `status`,
-        order_amount,
-        payment_amount as payment_amount ,
+        recharge_amount as order_amount,
+        recharge_amount as payment_amount ,
         create_time,
         end_time,
         pay_time,

--
Gitblit v1.7.1