Browse Source

冲突解决

limin 7 years ago
parent
commit
e1a8101037
1 changed files with 0 additions and 1 deletions
  1. 0 1
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

+ 0 - 1
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -1454,5 +1454,4 @@ select a.create_time as createTime,
 	</if>
 	where id = #{id,jdbcType=VARCHAR}
 </update>
->>>>>>> refs/remotes/origin/master
 </mapper>