From 3e2436955a5daf512098dc879c470ee88ce003eb Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:12:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/OperateUserMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/OperateUserMapper.xml b/src/main/resources/mapper/OperateUserMapper.xml
index 9c40420..1bb4be5 100644
--- a/src/main/resources/mapper/OperateUserMapper.xml
+++ b/src/main/resources/mapper/OperateUserMapper.xml
@@ -13,7 +13,7 @@
<result column="weixin" jdbcType="VARCHAR" property="weixin" />
<result column="is_delete" jdbcType="INTEGER" property="isDelete" />
<result column="create_time" property="createTime" />
- <result column="expireTime" property="expireTime" />
+ <result column="expire_time" property="expireTime" />
</resultMap>
<select id="findOperateUserList" resultMap="operateUserMap">
--
Gitblit v1.8.0