From 2a205a963433358deac72476773e1ca631384166 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 20 Dec 2023 14:17:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=A1=A8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/DTO/UserTrialViewModel.cs      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
index 3533fb164..aa5307d71 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
@@ -22,14 +22,14 @@ namespace IRaCIS.Application.Contracts
         [DictionaryTranslateAttribute("IsUserExitTrial")]
         public bool IsDeleted { get; set; }
 
-        [ExcelFormat("yyyy-MM-dd hh:mm:ss")]
+        [ExcelFormat("yyyy-MM-dd HH:mm:ss")]
         public DateTime? DeletedTime { get; set; }
 
         public Guid? SiteId { get; set; }
         public string Phone { get; set; } = String.Empty;
         public DateTime UpdateTime { get; set; }
 
-        [ExcelFormat("yyyy-MM-dd hh:mm:ss")]
+        [ExcelFormat("yyyy-MM-dd HH:mm:ss")]
         public DateTime CreateTime { get; set; }
 
 
@@ -84,7 +84,7 @@ namespace IRaCIS.Application.Contracts
 
 
         [ExporterHeader(Format = "yyyy-mm-DD hh:mm:ss")]
-        [ExcelFormat("yyyy-MM-dd hh:mm:ss")]
+        [ExcelFormat("yyyy-MM-dd HH:mm:ss")]
         public DateTime CreateTime { get; set; }
 
 
@@ -118,7 +118,8 @@ namespace IRaCIS.Application.Contracts
 
     public class ExcelExportInfo : TrialSelectDTO
     {
-        public string CurrentTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+        [ExcelFormat("yyyy-MM-dd HH:mm:ss")]
+        public DateTime CurrentTime { get; set; } = DateTime.Now;
 
         public bool IsEn_US { get; set; }