From 454e8c85ee7f47ff82fa93d502bde832c8f888f9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:18:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
src/main/resources/mapper/OperateUserMapper.xml | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/OperateUserMapper.xml b/src/main/resources/mapper/OperateUserMapper.xml
index 3f7a897..1bb4be5 100644
--- a/src/main/resources/mapper/OperateUserMapper.xml
+++ b/src/main/resources/mapper/OperateUserMapper.xml
@@ -12,8 +12,8 @@
<result column="email" jdbcType="VARCHAR" property="email" />
<result column="weixin" jdbcType="VARCHAR" property="weixin" />
<result column="is_delete" jdbcType="INTEGER" property="isDelete" />
- <result column="create_time" jdbcType="DATE" property="createTime" />
- <result column="create_time" jdbcType="DATE" property="expireTime" />
+ <result column="create_time" property="createTime" />
+ <result column="expire_time" property="expireTime" />
</resultMap>
<select id="findOperateUserList" resultMap="operateUserMap">
@@ -28,15 +28,6 @@
count(1)
FROM
operate_user
- </select>
-
- <select id="findOperateUser" resultMap="operateUserMap">
- SELECT
- *
- FROM
- operate_user
- WHERE
- id = #{id}
</select>
<delete id="deleteOperateUserList">
--
Gitblit v1.8.0