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

fengxiang

2017-12-22 454e8c85ee7f47ff82fa93d502bde832c8f888f9

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

# Conflicts:
#	src/main/java/com/moral/common/bean/PageBean.java

 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);
}

 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>