From 3374d19db03cce97572c3a294f137d1ea70b307f Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期四, 12 十二月 2024 13:26:05 +0800 Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat --- iailab-framework/iailab-common-web/src/main/java/com/iailab/framework/jackson/config/IailabJacksonAutoConfiguration.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/iailab-framework/iailab-common-web/src/main/java/com/iailab/framework/jackson/config/IailabJacksonAutoConfiguration.java b/iailab-framework/iailab-common-web/src/main/java/com/iailab/framework/jackson/config/IailabJacksonAutoConfiguration.java index 68f6aae..713525c 100644 --- a/iailab-framework/iailab-common-web/src/main/java/com/iailab/framework/jackson/config/IailabJacksonAutoConfiguration.java +++ b/iailab-framework/iailab-common-web/src/main/java/com/iailab/framework/jackson/config/IailabJacksonAutoConfiguration.java @@ -2,15 +2,15 @@ import cn.hutool.core.collection.CollUtil; import com.iailab.framework.common.util.json.JsonUtils; -import com.iailab.framework.jackson.core.databind.NumberSerializer; -import com.iailab.framework.jackson.core.databind.TimestampLocalDateTimeDeserializer; -import com.iailab.framework.jackson.core.databind.TimestampLocalDateTimeSerializer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; +import com.iailab.framework.common.util.json.databind.NumberSerializer; +import com.iailab.framework.common.util.json.databind.TimestampLocalDateTimeDeserializer; +import com.iailab.framework.common.util.json.databind.TimestampLocalDateTimeSerializer; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -- Gitblit v1.9.3