From f5d87a5a585adcbb148dee6c62ff6e18c4e7334c Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 26 May 2021 14:36:40 +0800 Subject: [PATCH] conflect --- src/main/resources/mapper/contract/ContractOrderDao.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/resources/mapper/contract/ContractOrderDao.xml b/src/main/resources/mapper/contract/ContractOrderDao.xml index 18c1f29..49f2f97 100644 --- a/src/main/resources/mapper/contract/ContractOrderDao.xml +++ b/src/main/resources/mapper/contract/ContractOrderDao.xml @@ -84,7 +84,7 @@ where member_id=#{memberId} and contract_type=2 </select> - <select id="selectFollowOrderCntForWinRate" resultType="java.lang.Integer"> + <select id="selectFollowOrderCntForWinRate" resultType="java.math.BigDecimal"> select count(1) from contract_order a where member_id=#{memberId} -- Gitblit v1.9.1