From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
index 424bf5e..bbb7fbd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
@@ -47,7 +47,7 @@
 	<select id="computeCompensateByUid" resultType="java.math.BigDecimal"
 		parameterType="java.lang.Long">
 		select
-		ecc_money
+		sum(ecc_money)
 		from yeshi_ec_extract_check_compensate
 		where ecc_uid=#{0}
 	</select>

--
Gitblit v1.8.0