From ac2e912c9dd7bafc9101775462fbe7060ce27a91 Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期五, 18 十月 2024 16:38:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0 into dev

---
 src/main/java/com/product/administration/controller/ConferenceManagerController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/product/administration/controller/ConferenceManagerController.java b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
index f44c41b..28102cc 100644
--- a/src/main/java/com/product/administration/controller/ConferenceManagerController.java
+++ b/src/main/java/com/product/administration/controller/ConferenceManagerController.java
@@ -27,7 +27,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;

--
Gitblit v1.9.2