Browse Source

修改冲突文件

wanghui 8 years ago
parent
commit
d4f9216e9c
1 changed files with 2 additions and 3 deletions
  1. 2 3
      src/main/java/com/goafanti/common/mapper/UserMapper.xml

+ 2 - 3
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1,6 +1,6 @@
 <?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.goafanti.common.dao.UserMapper">
+<mapper namespace="com.goafanti.common.dao.UserMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.User">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="mobile" jdbcType="VARCHAR" property="mobile" />
@@ -935,8 +935,7 @@
   	select number
   	from user
   	where id = #{id,jdbcType=VARCHAR}
-  </select>
-=======
+  </select>
 	<resultMap id="BaseResultMap" type="com.goafanti.common.model.User">
 		<id column="id" jdbcType="VARCHAR" property="id" />
 		<result column="mobile" jdbcType="VARCHAR" property="mobile" />