From 12f4c1594d72273d03b82969af72767773edcdd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 11 Jan 2022 21:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAExcel=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=97=E5=90=8D=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt
index c180459..566d9b8 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt
@@ -19,8 +19,8 @@ $foreach(item in genTable.Columns)
         /// 描述 : ${item.ColumnComment}
         /// 空值 :$if(item.IsRequired == "True") false $else true $end 
         /// </summary>
-$if(item.CsharpType == "DateTime")
-        [EpplusTableColumn(NumberFormat = "yyyy-MM-dd HH:mm:ss")]
+$if(replaceDto.ShowBtnExport)
+        [EpplusTableColumn(Header = "$if(item.ColumnComment == "")${item.CsharpField}${else}${item.ColumnComment}${end}"$if(item.CsharpType == "DateTime"), NumberFormat = "yyyy-MM-dd HH:mm:ss"$end)]
 $end
 $if(item.IsPk || item.IsIncrement)
         [SqlSugar.SugarColumn(IsPrimaryKey = ${item.IsPk.ToString().ToLower()}, IsIdentity = ${item.IsIncrement.ToString().ToLower()}$if(item.CsharpField.ToLower() != item.ColumnName.ToLower()), ColumnName = "$item.ColumnName"$end)]
@@ -28,9 +28,10 @@ $elseif(item.CsharpField.ToLower() != item.ColumnName.ToLower())
         [SugarColumn(ColumnName = "$item.ColumnName")]
 $end
         public $item.CsharpType$item.RequiredStr $item.CsharpField { get; set; }
-${end}
 
+${end}
 $if(genTable.TplCategory == "tree")
+
         [SugarColumn(IsIgnore = true)]
         public List<${replaceDto.ModelTypeName}> Children { get; set; }
 $end