From ee2678ecb9e8d686252feed920a7b2284acd54da Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 10:23:57 +0800
Subject: [PATCH] 冲突和修改

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

diff --git a/src/main/webapp/WEB-INF/config-mybatis.xml b/src/main/webapp/WEB-INF/config-mybatis.xml
index 0635b1a..861a53f 100644
--- a/src/main/webapp/WEB-INF/config-mybatis.xml
+++ b/src/main/webapp/WEB-INF/config-mybatis.xml
@@ -30,8 +30,9 @@
 		<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