From 7b51b4e57cdb4c1e5ea0972b0af241a9f291e9d2 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 8 Jul 2024 17:02:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89logback=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xymanager_common/pom.xml                               | 10 ++++++++++
 .../com/shxy/xymanager_common/util/MyDateUtils.java    |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/xymanager_common/pom.xml b/xymanager_common/pom.xml
index 4ac144e..f92e62a 100644
--- a/xymanager_common/pom.xml
+++ b/xymanager_common/pom.xml
@@ -120,6 +120,16 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--JNA:调用本地dll-->
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java
index eebd72e..1b97555 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java
@@ -1,6 +1,5 @@
 package com.shxy.xymanager_common.util;
 
-import ch.qos.logback.core.util.TimeUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;