From b4db4529845be5a229431cbc358ed0ed6485e970 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Wed, 26 Aug 2020 09:50:58 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index b79e695..62b425d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -168,7 +168,10 @@
product_order_detail DE
LEFT JOIN product_order PRO ON DE.order_id = PRO.id
<include refid="whereforall"/>
- order by DE.pro_endtime asc,DE.id asc
+ order by
+ DE.pro_endtime ASC,
+ DE.pro_begintime ASC,
+ DE.id asc
</select>
<select id="getEnabledCount" resultType="int" parameterType="long">
--
Gitblit v1.8.0