Merge branch 'main' of http://10.10.14.176:3000/huanghai/YangPuBaoMing

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
+    }
+  ]
 }

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