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/DeviceVersionMapper.xml | 22 +++-------------------
src/main/java/com/moral/mapper/DeviceVersionMapper.java | 1 -
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceVersionMapper.java b/src/main/java/com/moral/mapper/DeviceVersionMapper.java
index 8dfa431..62d949e 100644
--- a/src/main/java/com/moral/mapper/DeviceVersionMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceVersionMapper.java
@@ -4,5 +4,4 @@
import com.moral.entity.DeviceVersion;
public interface DeviceVersionMapper extends BaseMapper<DeviceVersion> {
- DeviceVersion selectByPrimaryKey(Integer id);
}
\ No newline at end of file
diff --git a/src/main/resources/mapper/DeviceVersionMapper.xml b/src/main/resources/mapper/DeviceVersionMapper.xml
index 5d7ef20..bd180f5 100644
--- a/src/main/resources/mapper/DeviceVersionMapper.xml
+++ b/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -1,20 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.moral.mapper.DeviceVersionMapper" >
- <resultMap id="BaseResultMap" type="com.moral.entity.DeviceVersion" >
- <id column="id" property="id" jdbcType="INTEGER" />
- <result column="name" property="name" jdbcType="VARCHAR" />
- <result column="version" property="version" jdbcType="INTEGER" />
- <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
- <result column="description" property="description" jdbcType="VARCHAR" />
- </resultMap>
- <sql id="Base_Column_List" >
- id, name, version, create_time, description
- </sql>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
- select
- <include refid="Base_Column_List" />
- from device_version
- where id = #{id,jdbcType=INTEGER}
- </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.mapper.DeviceVersionMapper">
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0