From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/mybatis-config.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/mybatis-config.xml b/src/main/resources/mapper/mybatis-config.xml
index 579b6dd..6c9d9fc 100644
--- a/src/main/resources/mapper/mybatis-config.xml
+++ b/src/main/resources/mapper/mybatis-config.xml
@@ -6,6 +6,7 @@
 <configuration>
     <typeAliases>
        <typeAlias type="com.moral.mapper.type.AlarmConfigValueHandle" alias="AlarmConfigValueHandle"/>
+        <typeAlias type="com.moral.mapper.type.AdjustValueTypeHandle" alias="AdjustValueTypeHandle"/>
 	   <package name="com.moral.entity" />
     </typeAliases>
 </configuration>
\ No newline at end of file

--
Gitblit v1.8.0