From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
index 61f1ac4..18f8617 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
@@ -12,8 +12,8 @@
<where>
<!--查询条件自行添加-->
1=1
- <if test="p.recordId != null and p.recordId !=''">
- and record_id = #{p.recordId}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
<if test="p.lastRecordId != null and p.lastRecordId !=''">
and last_record_id = #{p.lastRecordId}
@@ -48,7 +48,7 @@
<include refid="Column_List"/>
from consumption_record
<include refid="where"/>
- order by record_id desc
+ order by id desc
limit 1
</select>
@@ -58,6 +58,6 @@
<include refid="Column_List"/>
from consumption_record
<include refid="where"/>
- order by record_id desc
+ order by id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0