Merge branch 'testQQ'

# Conflicts:
#	pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 	<parent>
 		<groupId>com.yoho</groupId>
 		<groupId>com.yoho</groupId>
 		<artifactId>parent</artifactId>
 		<artifactId>parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 	</parent>
 
 
 	<groupId>com.yoho.dsf</groupId>
 	<groupId>com.yoho.dsf</groupId>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+    <settings>
+        <setting name="defaultStatementTimeout" value="2"/> <!-- seconds -->
+    </settings>
+</configuration>