From 42008124b68bfd7f2e2003c07bc0bdd5311f95b6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 29 四月 2020 09:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi/src/main/resources/mybatis/mybatis-config.xml |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ruoyi/src/main/resources/mybatis/mybatis-config.xml b/ruoyi/src/main/resources/mybatis/mybatis-config.xml
index c7c36e3..e8b52be 100644
--- a/ruoyi/src/main/resources/mybatis/mybatis-config.xml
+++ b/ruoyi/src/main/resources/mybatis/mybatis-config.xml
@@ -1,15 +1,15 @@
-<?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="cacheEnabled"             value="true" />  <!-- 鍏ㄥ眬鏄犲皠鍣ㄥ惎鐢ㄧ紦瀛� -->
-		<setting name="useGeneratedKeys"         value="true" />  <!-- 鍏佽 JDBC 鏀寔鑷姩鐢熸垚涓婚敭 -->
-		<setting name="defaultExecutorType"      value="REUSE" /> <!-- 閰嶇疆榛樿鐨勬墽琛屽櫒 -->
-		<setting name="logImpl"                  value="SLF4J" /> <!-- 鎸囧畾 MyBatis 鎵�鐢ㄦ棩蹇楃殑鍏蜂綋瀹炵幇 -->
-		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  椹煎嘲寮忓懡鍚� -->
-	</settings>
-	
-</configuration>
+<?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="cacheEnabled"             value="true" />  <!-- 鍏ㄥ眬鏄犲皠鍣ㄥ惎鐢ㄧ紦瀛� -->
+		<setting name="useGeneratedKeys"         value="true" />  <!-- 鍏佽 JDBC 鏀寔鑷姩鐢熸垚涓婚敭 -->
+		<setting name="defaultExecutorType"      value="REUSE" /> <!-- 閰嶇疆榛樿鐨勬墽琛屽櫒 -->
+		<setting name="logImpl"                  value="SLF4J" /> <!-- 鎸囧畾 MyBatis 鎵�鐢ㄦ棩蹇楃殑鍏蜂綋瀹炵幇 -->
+		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  椹煎嘲寮忓懡鍚� -->
+	</settings>
+	
+</configuration>

--
Gitblit v1.9.3