From 221b5b72440f383e231f720f2209f7bf1b394a73 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 九月 2019 18:46:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml
index f04705a..88524f3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml
@@ -37,7 +37,6 @@
     <result column="sc_expiry_day" property="expiryDay" jdbcType="INTEGER"/>
     <result column="sc_rule" property="rule" jdbcType="VARCHAR"/>
     <result column="sc_remark" property="remark" jdbcType="VARCHAR"/>
-    <result column="sc_receive_count" property="receiveCount" jdbcType="INTEGER"/>
     <result column="sc_state" property="state" jdbcType="INTEGER"/>
     <result column="sc_create_time" property="createTime" jdbcType="TIMESTAMP"/>
     <result column="sc_update_time" property="updateTime" jdbcType="TIMESTAMP"/>

--
Gitblit v1.8.0