From 47f157086a556d96e7bcfc9adfe17ecf7c154dfe Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 08 六月 2020 17:27:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 6 +++++- 1 files changed, 5 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 f627964..128a60f 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 @@ -108,6 +108,8 @@ <result column="co_state_desc" property="stateDesc" jdbcType="VARCHAR" /> <result column="co_uid" property="userId" jdbcType="VARCHAR" /> <result column="co_urank" property="urank" jdbcType="INTEGER" /> + <result column="co_child_source_type" property="childSourceType" + jdbcType="VARCHAR" /> <association property="userInfo" column="co_uid" resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" /> <association property="commonOrderGoods" column="co_order_goods_id" @@ -151,6 +153,8 @@ <result column="co_trade_id" property="tradeId" jdbcType="VARCHAR" /> <result column="co_state_desc" property="stateDesc" jdbcType="VARCHAR" /> <result column="co_urank" property="urank" jdbcType="INTEGER" /> + <result column="co_child_source_type" property="childSourceType" + jdbcType="VARCHAR" /> <association property="userInfo" column="co_uid" select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPrimaryKey" /> <association property="commonOrderGoods" column="co_order_goods_id" @@ -167,7 +171,7 @@ co_order_goods_id,co_count,co_state,co_state_whole_order, co_estimate,co_eIncome,co_payment,co_settlement, co_third_create_time, MAX(co_settle_time) AS co_settle_time, co_order_by, co_create_time, - co_update_time,co_state_desc,co_urank + co_update_time,co_state_desc,co_urank,co_child_source_type </sql> <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long"> -- Gitblit v1.8.0