diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
index 3547603..01fa214 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
@@ -72,380 +72,382 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         //多线程执行
         CompletionService<Boolean> threadService = ThreadUtil.newCompletionService(Executors.newFixedThreadPool(100));
         List<Callable<Boolean>> calls = com.google.common.collect.Lists.newArrayList();
-        List<TableMerge> allMergeList = org.apache.commons.compress.utils.Lists.newArrayList();
+        List<TableMerge> allMergeList1 = org.apache.commons.compress.utils.Lists.newArrayList();
+        List<TableMerge> allMergeList2 = org.apache.commons.compress.utils.Lists.newArrayList();
+        List<TableMerge> allMergeList3 = org.apache.commons.compress.utils.Lists.newArrayList();
 
-        calls.add(() -> {
-            res1(blTeacherMain, result);
-            return true;
-        });
-
-        calls.add(() -> {
-            res2(blTeacherMain, result);
-            return true;
-        });
-
-        calls.add(() -> {
-            res3(blTeacherMain, result);
-            return true;
-        });
-
-        calls.add(() -> {
-            res4(blTeacherMain, result);
-            return true;
-        });
-
-        //-----------------堆叠图------------------------
-        calls.add(() -> {
-            tj1(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj3(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj5(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj16(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj24(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj26(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj28(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj30(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj32(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj34(blTeacherMain, result);
-            return true;
-        });
-        //-----------------堆叠图------------------------
-
-
-        //----------------雷达图-------------------------
-        calls.add(() -> {
-            tj2(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj4(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj6(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj17(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj25(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj27(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj29(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj31(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj33(blTeacherMain, result);
-            return true;
-        });
-
-        //----------------雷达图-------------------------
-
-
-
-        //----------------多柱图-------------------------
-        calls.add(() -> {
-            tj8(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj9(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj11(blTeacherMain, result);
-            return true;
-        });
-
-        calls.add(() -> {
-            tj12(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj15(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj14(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj19(blTeacherMain, result);
-            return true;
-        });
-
-        calls.add(() -> {
-            tj20(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj21(blTeacherMain, result);
-            return true;
-        });
-
-        calls.add(() -> {
-            tj22(blTeacherMain, result);
-            return true;
-        });
-
-        calls.add(() -> {
-            tj23(blTeacherMain, result);
-            return true;
-        });
-        //----------------多柱图-------------------------
-
-        //----------------单柱图-------------------------
-        calls.add(() -> {
-            tj7(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj10(blTeacherMain, result);
-            return true;
-        });
-
-        calls.add(() -> {
-            tj13(blTeacherMain, result);
-            return true;
-        });
-
-        calls.add(() -> {
-            tj18(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj35(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tj36(blTeacherMain, result);
-
-            return true;
-        });
-        //----------------单柱图-------------------------
-
-        //----------------插入表格及文字-----------------------
-
-        calls.add(() -> {
-            tab1(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-            tab2(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-            tab3(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-            tab4(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-            tab5(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-            tab6(wo, blTeacherMain);
-            return true;
-        });
-        calls.add(() -> {
-            tab7(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-            tab8(wo, blTeacherMain);
-            return true;
-        });
+//        calls.add(() -> {
+//            res1(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            res2(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            res3(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            res4(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        //-----------------堆叠图------------------------
+//        calls.add(() -> {
+//            tj1(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj3(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj5(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj16(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj24(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj26(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj28(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj30(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj32(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj34(blTeacherMain, result);
+//            return true;
+//        });
+//        //-----------------堆叠图------------------------
+//
+//
+//        //----------------雷达图-------------------------
+//        calls.add(() -> {
+//            tj2(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj4(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj6(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj17(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj25(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj27(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj29(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj31(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj33(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        //----------------雷达图-------------------------
+//
+//
+//
+//        //----------------多柱图-------------------------
+//        calls.add(() -> {
+//            tj8(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj9(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj11(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tj12(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj15(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj14(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj19(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tj20(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj21(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tj22(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tj23(blTeacherMain, result);
+//            return true;
+//        });
+//        //----------------多柱图-------------------------
+//
+//        //----------------单柱图-------------------------
+//        calls.add(() -> {
+//            tj7(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj10(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tj13(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tj18(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj35(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tj36(blTeacherMain, result);
+//
+//            return true;
+//        });
+//        //----------------单柱图-------------------------
+//
+//        //----------------插入表格及文字-----------------------
+//
+//        calls.add(() -> {
+//            tab1(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tab2(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tab3(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tab4(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tab5(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tab6(wo, blTeacherMain);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tab7(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tab8(wo, blTeacherMain);
+//            return true;
+//        });
 
         calls.add(() -> {
             tab9(wo, blTeacherMain);
             return true;
         });
-
-        calls.add(() -> {
-        res6(blTeacherMain, result);
-            return true;
-        });
-
-        calls.add(() -> {
-            tab10(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-            res7(blTeacherMain, result);
-            return true;
-        });
-        calls.add(() -> {
-            tab11(wo, blTeacherMain);
-            return true;
-        });
-        calls.add(() -> {
-            tab12(wo, blTeacherMain);
-            return true;
-        });
-
+//
+//        calls.add(() -> {
+//        res6(blTeacherMain, result);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            tab10(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            res7(blTeacherMain, result);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tab11(wo, blTeacherMain);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tab12(wo, blTeacherMain);
+//            return true;
+//        });
+//
         calls.add(() -> {
             var mergeList =res5(wo, blTeacherMain);
-            allMergeList.addAll(mergeList);
+            allMergeList1.addAll(mergeList);
             return true;
         });
 
         calls.add(() -> {
             var mergeList =tab13(wo, blTeacherMain);
-            allMergeList.addAll(mergeList);
+            allMergeList2.addAll(mergeList);
             return true;
         });
         calls.add(() -> {
             var mergeList =tab14(wo, blTeacherMain);
-            allMergeList.addAll(mergeList);
-            return true;
-        });
-
-        calls.add(() -> {
-            tab15(wo, blTeacherMain);
-            return true;
-        });
-
-
-        calls.add(() -> {
-            tab16(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-            res8(blTeacherMain, result);
-            return true;
-        });
-
-
-        calls.add(() -> {
-        tab17(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab18(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab19(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab20(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab21(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab22(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab23(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab24(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab25(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab26(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab27(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab28(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab29(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab30(wo, blTeacherMain);
-            return true;
-        });
-
-        calls.add(() -> {
-        tab31(wo, blTeacherMain);
-            return true;
-        });
-        calls.add(() -> {
-        tab32(wo, blTeacherMain);
-            return true;
-        });
-        calls.add(() -> {
-            tab33(wo, blTeacherMain);
+            allMergeList3.addAll(mergeList);
             return true;
         });
+//
+//        calls.add(() -> {
+//            tab15(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//
+//        calls.add(() -> {
+//            tab16(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//            res8(blTeacherMain, result);
+//            return true;
+//        });
+//
+//
+//        calls.add(() -> {
+//        tab17(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab18(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab19(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab20(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab21(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab22(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab23(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab24(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab25(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab26(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab27(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab28(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab29(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab30(wo, blTeacherMain);
+//            return true;
+//        });
+//
+//        calls.add(() -> {
+//        tab31(wo, blTeacherMain);
+//            return true;
+//        });
+//        calls.add(() -> {
+//        tab32(wo, blTeacherMain);
+//            return true;
+//        });
+//        calls.add(() -> {
+//            tab33(wo, blTeacherMain);
+//            return true;
+//        });
         //----------------插入表格-----------------------
 
         calls.forEach(threadService::submit);
@@ -460,8 +462,33 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         log.info("多线程主线程结束执行");
 
         WordOperator wo2 = WordOperator.twoReplaceWord(wo);
+
+
+
+        int i = 0;
+//        for (TableMerge tableMerge : allMergeList1){
+//            wo2.addTableMerge(tableMerge, i % 2 == 0?"c5d5e9":"f6f8fc");
+//            i++;
+//            wo2.changeTableFillColor(tableMerge.getTableIndex(), tableMerge.getEndRow()+1, tableMerge.getCol(), i % 2 == 0?"c5d5e9":"f6f8fc");
+//            i++;
+//        }
+        TableMerge tableMerge2 =allMergeList1.get(0);
+        wo2.addTableMerge(tableMerge2, (tableMerge2.getStartRow()+1) % 2 == 0?"c5d5e9":"f6f8fc");
+
+        i = 0;
+        for (TableMerge tableMerge : allMergeList2){
+            wo2.addTableMerge(tableMerge, i % 2 == 0?"c5d5e9":"f6f8fc");
+            i++;
+        }
+
+        i = 0;
+        for (TableMerge tableMerge : allMergeList3){
+            wo2.addTableMerge(tableMerge, i % 2 == 0?"c5d5e9":"f6f8fc");
+            i++;
+        }
+
         //合并行
-        allMergeList.forEach(wo2::addTableMerge);
+//        allMergeList.forEach(wo2::addTableMerge);
 
         WordOperator wo3 = WordOperator.twoReplaceWord(wo2);
         wo3.replaceTextPlus(result);