Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-07 46670e34c1105649da6091a0829b9451c9fe5b37

 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>