From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/resources/mapper/mybatis-config.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/mybatis-config.xml b/src/main/resources/mapper/mybatis-config.xml
index 579b6dd..f6f3497 100644
--- a/src/main/resources/mapper/mybatis-config.xml
+++ b/src/main/resources/mapper/mybatis-config.xml
@@ -4,8 +4,12 @@
"http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration>
+ <settings>
+ <setting name="callSettersOnNulls" value="true"/>
+ </settings>
<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