Merge remote-tracking branch 'origin/master' into dev

许鹏程

2024-09-14 301a0ae856cea8f19936991ff977b4717e83dc8e

 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;