Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-24 153b891aea3fab7528d497e2ededf294fa016c3a

 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">