From ac61bdd7a7f4834d35bf42a06bc766981f50211e Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 29 Jan 2021 20:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
index 138bd76..eb0d269 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -125,8 +125,11 @@
<if test="record.shopId != null and record.shopId != ''">
and a.shop_id=#{record.shopId}
</if>
-
</where>
+ <if test="record.sort !=null">
+ order by
+ a.${record.sort} ${record.order}
+ </if>
<if test="record.offset >=0 and record.limit >0">
limit
#{record.offset},#{record.limit}
--
Gitblit v1.9.1