From a7bf2b211cefab27df0d8c324cb6e70ec9643fc8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 29 一月 2019 12:32:27 +0800
Subject: [PATCH] Merge branch 'div'

---
 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
index 96b52f9..f5c68ff 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
@@ -329,8 +329,8 @@
 		SELECT COALESCE(SUM(hb.`hb_money`),0)AS totalMoney,
 				hb.hb_state AS hongBaoState,
 				hb.`hb_type` AS hongBaoType,
-				hb.`hb_get_time` AS accountTime,
-				hb.`hb_pre_get_time`AS preAccountTime,
+				MAX(hb.`hb_get_time`) AS accountTime,
+				MAX(hb.`hb_pre_get_time`)AS preAccountTime,
 				co.*
 		FROM yeshi_ec_hongbao_order ho 
 		

--
Gitblit v1.8.0