From 3a9e2e7e5ac6b7fdcb8894f5f11792187c579e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 21 Apr 2023 11:51:50 +0800
Subject: [PATCH] 'commit'

---
 .../FengHuang/Yp/Controller/YpController.java |  1 +
 .../YangPuZhaoShengExcel.json                 | 96 +++++++++----------
 target/classes/Sql/yp.sql                     | 12 +--
 3 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java
index 1791d3f..b6f22e5 100644
--- a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java
+++ b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java
@@ -3,6 +3,7 @@ package com.dsideal.FengHuang.Yp.Controller;
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.FengHuang.Interceptor.*;
 import com.dsideal.FengHuang.LoginPerson.Model.LoginPersonModel;
+import com.dsideal.FengHuang.Swagger.annotation.ActionApi;
 import com.dsideal.FengHuang.Swagger.annotation.Api;
 import com.dsideal.FengHuang.Util.CommonUtil;
 import com.dsideal.FengHuang.Util.ExcelExportUtil;
diff --git a/target/classes/ExcelExportTemplate/YangPuZhaoShengExcel.json b/target/classes/ExcelExportTemplate/YangPuZhaoShengExcel.json
index b0b4960..ba5cce4 100644
--- a/target/classes/ExcelExportTemplate/YangPuZhaoShengExcel.json
+++ b/target/classes/ExcelExportTemplate/YangPuZhaoShengExcel.json
@@ -1,49 +1,49 @@
-{
-  "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": "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
diff --git a/target/classes/Sql/yp.sql b/target/classes/Sql/yp.sql
index 9fa9bfc..d310146 100644
--- a/target/classes/Sql/yp.sql
+++ b/target/classes/Sql/yp.sql
@@ -1,7 +1,7 @@
--- 应用接入命名空间
-#namespace("yp")
-  #sql("getTaskInfo")
-    select * from t_yp_record where task_id=#para(task_id) and bx_id=#para(bx_id)
-  #end
-
+-- 应用接入命名空间
+#namespace("yp")
+  #sql("getTaskInfo")
+    select * from t_yp_record where task_id=#para(task_id) and bx_id=#para(bx_id)
+  #end
+
 #end
\ No newline at end of file