From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/ScanHistoryMapper.xml |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/ScanHistoryMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/ScanHistoryMapper.xml
index f8eaead..aab4649 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/ScanHistoryMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ScanHistoryMapper.xml
@@ -1,10 +1,10 @@
-<?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.yeshi.fanli.dao.mybatis.ScanHistoryMapper">
-	
-	<select id="countUserScanHistory" parameterType="java.lang.Long" resultType="java.lang.Long">
-   		SELECT IFNULL(COUNT(id),0) FROM  yeshi_ec_scanhistory WHERE uid=#{userId,jdbcType=BIGINT}
-   </select>
-	
-</mapper>
+<?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.yeshi.fanli.dao.mybatis.ScanHistoryMapper">
+	
+	<select id="countUserScanHistory" parameterType="java.lang.Long" resultType="java.lang.Long">
+   		SELECT IFNULL(COUNT(id),0) FROM  yeshi_ec_scanhistory WHERE uid=#{userId,jdbcType=BIGINT}
+   </select>
+	
+</mapper>

--
Gitblit v1.8.0