From 391f2e33973b93b0aee53ca93affb1c92eb9a9d7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 10 一月 2019 09:03:48 +0800
Subject: [PATCH] Merge branch 'master' into div1

---
 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 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 c59f3e0..f6d67f6 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
@@ -347,7 +347,7 @@
 	<select id="listOrderGoodsInfo" resultMap="ResultMap"	parameterType="java.util.List">
 		 <!-- 鏌ヨ鐢ㄦ埛璁㈠崟鍟嗗搧淇℃伅 -->
 		SELECT COALESCE(SUM(tc.`co_payment`),0)AS totalPayment,COALESCE(SUM(tc.`co_settlement`),0)AS totalSettlement,
-			COALESCE(SUM(tc.`co_count`),0)AS totalCount,tc.`co_source_type`,tc.`co_order_no`,tg.*
+			COALESCE(SUM(tc.`co_count`),0)AS totalCount,tc.`co_source_type`,tc.`co_order_no`,tg.*,tc.co_id
 		FROM
 		yeshi_ec_common_order_goods tg
 		LEFT JOIN yeshi_ec_common_order tc ON tc.`co_order_goods_id` = tg.`cog_id`

--
Gitblit v1.8.0