From 7454b6532cd2a5c68235a45f1cc540e25f1ffaf4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 四月 2023 18:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml
index 08fdf80..68accb2 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml
@@ -12,6 +12,7 @@
<result column="changeType" property="changeType"/>
<result column="oldData" property="oldData"/>
<result column="newData" property="newData"/>
+ <result column="orderId" property="orderId"/>
<result column="explain" property="explain"/>
<result column="createTime" property="createTime"/>
</resultMap>
@@ -21,7 +22,7 @@
<select id="queryDriverIntegralIncomeAndExpenses" resultType="com.supersavedriving.driver.modular.system.warpper.IntegralIncomeAndExpensesWarpper">
select * from (
select
- explain as description,
+ `explain` as description,
UNIX_TIMESTAMP(createTime) * 1000 as createTime,
(newData - oldData) as integral
from t_account_change_detail where `type` = 2 and userType = 2 and userId = #{driverId}
--
Gitblit v1.7.1