From 936ce45229319a903a2d1c8e08c267c1e6f2df5f Mon Sep 17 00:00:00 2001
From: zhangxin <Xin.zhang@le-it.com.cn>
Date: Mon, 22 Mar 2021 14:44:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A8=E5=B1=80=E7=9A=84ti?=
 =?UTF-8?q?me=20location=20grmi=E7=B1=BB=E5=9E=8B=E7=9A=84datetime?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=8C=87=E5=AE=9Alocation=E4=B8=BA=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80location?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 grmi/DateTime.go | 3 ++-
 utils/time.go    | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/grmi/DateTime.go b/grmi/DateTime.go
index f3279c0..a5403fe 100644
--- a/grmi/DateTime.go
+++ b/grmi/DateTime.go
@@ -1,6 +1,7 @@
 package grmi
 
 import (
+	"LAPP_GAAS_GFrame_BACKEND/utils"
 	"encoding/json"
 	"fmt"
 	"time"
@@ -18,7 +19,7 @@ func (self *DateTime) UnmarshalJSON(data []byte) error {
 	if err != nil {
 		return err
 	}
-	result, err := time.Parse(URLDateTimeFormat, jsonString)
+	result, err := time.ParseInLocation(URLDateTimeFormat, jsonString, utils.TimeZoneLocation)
 	if err != nil {
 		return err
 	}
diff --git a/utils/time.go b/utils/time.go
index 2b8b834..02df1ae 100644
--- a/utils/time.go
+++ b/utils/time.go
@@ -9,6 +9,9 @@ import (
 	"time"
 )
 
+
+var TimeZoneLocation, _ = time.LoadLocation("Asia/Shanghai")
+
 type ITimer struct {
 	*time.Timer
 	name      string