From 62c46d1873cfd131af905f924b364c39abfba455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Sun, 23 Apr 2023 15:33:07 +0800
Subject: [PATCH] 'commit'

---
 .../TouPiaoSummaryGaoJi.json                  |  19 ----
 .../TouPiaoSummaryZhongJi.json                |  19 ----
 .../YangPuZhaoShengExcel.json                 | 101 +++++++++---------
 3 files changed, 53 insertions(+), 86 deletions(-)
 delete mode 100644 src/main/resource/ExcelExportTemplate/TouPiaoSummaryGaoJi.json
 delete mode 100644 src/main/resource/ExcelExportTemplate/TouPiaoSummaryZhongJi.json

diff --git a/src/main/resource/ExcelExportTemplate/TouPiaoSummaryGaoJi.json b/src/main/resource/ExcelExportTemplate/TouPiaoSummaryGaoJi.json
deleted file mode 100644
index 9a1b031..0000000
--- a/src/main/resource/ExcelExportTemplate/TouPiaoSummaryGaoJi.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "title": "高级职称评定结果",
-  "sheetName": "高级",
-  "titleHeight": 30,
-  "rowHeight": 30,
-  "showNumber": true,
-  "colInfo": [
-    {
-      "show_column_name": "姓名",
-      "list_column_name": "houxuanren_name",
-      "width": 40
-    },
-    {
-      "show_column_name": "分数",
-      "list_column_name": "score",
-      "width": 40
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/main/resource/ExcelExportTemplate/TouPiaoSummaryZhongJi.json b/src/main/resource/ExcelExportTemplate/TouPiaoSummaryZhongJi.json
deleted file mode 100644
index d0c1b67..0000000
--- a/src/main/resource/ExcelExportTemplate/TouPiaoSummaryZhongJi.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "title": "中级职称评定结果",
-  "sheetName": "中级",
-  "titleHeight": 30,
-  "rowHeight": 30,
-  "showNumber": true,
-  "colInfo": [
-    {
-      "show_column_name": "姓名",
-      "list_column_name": "houxuanren_name",
-      "width": 40
-    },
-    {
-      "show_column_name": "分数",
-      "list_column_name": "score",
-      "width": 40
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json b/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json
index b0b4960..7390fea 100644
--- a/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json
+++ b/src/main/resource/ExcelExportTemplate/YangPuZhaoShengExcel.json
@@ -1,49 +1,54 @@
-{
-  "title": "招生结果",
-  "sheetName": "结果",
-  "titleHeight": 30,
-  "rowHeight": 30,
-  "showNumber": true,
-  "colInfo": [
-    {
-      "show_column_name": "姓名",
-      "list_column_name": "name",
-      "width": 40
-    },
-    {
-      "show_column_name": "性别",
-      "list_column_name": "xb",
-      "width": 20
-    },
-    {
-      "show_column_name": "家庭住址",
-      "list_column_name": "address",
-      "width": 50
-    },
-    {
-      "show_column_name": "父亲姓名",
-      "list_column_name": "address",
-      "width": 40
-    },
-    {
-      "show_column_name": "母亲姓名",
-      "list_column_name": "address",
-      "width": 40
-    },
-    {
-      "show_column_name": "身份证号",
-      "list_column_name": "sfzh",
-      "width": 40
-    },
-    {
-      "show_column_name": "联系电话",
-      "list_column_name": "tel",
-      "width": 40
-    },
-    {
-      "show_column_name": "申报时间",
-      "list_column_name": "create_time",
-      "width": 40
-    }
-  ]
+{
+  "title": "招生结果",
+  "sheetName": "结果",
+  "titleHeight": 30,
+  "rowHeight": 30,
+  "showNumber": true,
+  "colInfo": [
+    {
+      "show_column_name": "班型",
+      "list_column_name": "bx_name",
+      "width": 40
+    },
+    {
+      "show_column_name": "姓名",
+      "list_column_name": "name",
+      "width": 40
+    },
+    {
+      "show_column_name": "性别",
+      "list_column_name": "xb",
+      "width": 20
+    },
+    {
+      "show_column_name": "家庭住址",
+      "list_column_name": "address",
+      "width": 50
+    },
+    {
+      "show_column_name": "父亲姓名",
+      "list_column_name": "address",
+      "width": 40
+    },
+    {
+      "show_column_name": "母亲姓名",
+      "list_column_name": "address",
+      "width": 40
+    },
+    {
+      "show_column_name": "身份证号",
+      "list_column_name": "sfzh",
+      "width": 40
+    },
+    {
+      "show_column_name": "联系电话",
+      "list_column_name": "tel",
+      "width": 40
+    },
+    {
+      "show_column_name": "申报时间",
+      "list_column_name": "create_time",
+      "width": 40
+    }
+  ]
 }
\ No newline at end of file