diff --git a/src/main/java/UnitTest/OpenGaussReplicationToKafka.java b/src/main/java/UnitTest/OpenGaussReplicationToKafka.java
index 6c43158..c91214b 100644
--- a/src/main/java/UnitTest/OpenGaussReplicationToKafka.java
+++ b/src/main/java/UnitTest/OpenGaussReplicationToKafka.java
@@ -183,39 +183,16 @@ public class OpenGaussReplicationToKafka {
     public static void main(String[] args) throws Exception {
 
         //初始化数据库链接
-
         Init();
-
-
         // 删除槽
-<<<<<<< HEAD
-
-
-=======
->>>>>>> 352d297806f35f93e0a702f9cbebc494170d1916
-//        DeleteSlot(slotName);
-
+        // DeleteSlot(slotName);
         // 创建槽
-
-//        CreateSlot(slotName);
-<<<<<<< HEAD
-
-
-=======
->>>>>>> 352d297806f35f93e0a702f9cbebc494170d1916
+        // CreateSlot(slotName);
         // 查看槽
-
-        //ListSlot();
-//        TruncateTable();
-<<<<<<< HEAD
-
-
-=======
->>>>>>> 352d297806f35f93e0a702f9cbebc494170d1916
+        // ListSlot();
+        // TruncateTable();
         //插入测试数据
-
 //        InsertTestData();
-
         //获取最后的读取偏移位置
 
         String lsn = GetRestartLsn(slotName);
diff --git a/src/main/java/com/dsideal/FengHuang/Exam/Controller/ExamController.java b/src/main/java/com/dsideal/FengHuang/Exam/Controller/ExamController.java
index 6237337..421e4d0 100644
--- a/src/main/java/com/dsideal/FengHuang/Exam/Controller/ExamController.java
+++ b/src/main/java/com/dsideal/FengHuang/Exam/Controller/ExamController.java
@@ -30,7 +30,6 @@ public class ExamController extends Controller {
         //清库脚本
         PgSqlUtil.Truncate("t_exam_person");
         PgSqlUtil.Truncate("t_exam_record");
-        PgSqlUtil.Truncate("t_exam_question");
         Kv kv = Kv.by("success", true);
         kv.set("message", "清库成功！");
         renderJson(kv);
diff --git a/target/classes/ExcelExportTemplate/excelTemp/0FA61AAF-59AA-45BE-BCA3-DA21992E0EBE.xlsx b/target/classes/ExcelExportTemplate/excelTemp/0FA61AAF-59AA-45BE-BCA3-DA21992E0EBE.xlsx
deleted file mode 100644
index 56e9b06..0000000
Binary files a/target/classes/ExcelExportTemplate/excelTemp/0FA61AAF-59AA-45BE-BCA3-DA21992E0EBE.xlsx and /dev/null differ