From f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 26 一月 2021 18:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/webapp/WEB-INF/config-mybatis.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/config-mybatis.xml b/src/main/webapp/WEB-INF/config-mybatis.xml
index a2b08d0..365d9cd 100644
--- a/src/main/webapp/WEB-INF/config-mybatis.xml
+++ b/src/main/webapp/WEB-INF/config-mybatis.xml
@@ -15,7 +15,7 @@
 		<setting name="useGeneratedKeys" value="false"/>
 		<setting name="defaultExecutorType" value="SIMPLE"/>
 		<setting name="defaultStatementTimeout" value="25000"/>
-		<setting name="logImpl" value="LOG4J" />
+		<setting name="logImpl" value="STDOUT_LOGGING" />
 	</settings>
 
 	<typeHandlers>
@@ -29,8 +29,10 @@
 		<typeHandler handler="com.nanometer.smartlab.entity.handler.EmailSendStatusHandler"/>
 		<typeHandler handler="com.nanometer.smartlab.entity.handler.DangerousFlagHandler"/>
 		<typeHandler handler="com.nanometer.smartlab.entity.handler.WarningLevelHandler"/>
+		<typeHandler handler="com.nanometer.smartlab.entity.handler.ReplaceDictTypeHandler"/>
+		<typeHandler handler="com.nanometer.smartlab.entity.handler.WasterHandler"/>
 	</typeHandlers>
-    
+
 </configuration>
 
 

--
Gitblit v1.9.2