|
@@ -7,7 +7,7 @@ import (
|
|
|
|
|
|
|
|
func ParseTime(timeStr string) (*time.Time, error) {
|
|
func ParseTime(timeStr string) (*time.Time, error) {
|
|
|
if strutils.IsStringEmpty(timeStr) {
|
|
if strutils.IsStringEmpty(timeStr) {
|
|
|
- return &time.Time{}, nil
|
|
|
|
|
|
|
+ return nil, nil
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
t, err := time.Parse(time.RFC3339Nano, timeStr)
|
|
t, err := time.Parse(time.RFC3339Nano, timeStr)
|
|
@@ -15,5 +15,8 @@ func ParseTime(timeStr string) (*time.Time, error) {
|
|
|
return nil, err
|
|
return nil, err
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ loc, _ := time.LoadLocation("Asia/Shanghai")
|
|
|
|
|
+ t = t.In(loc)
|
|
|
|
|
+
|
|
|
return &t, nil
|
|
return &t, nil
|
|
|
}
|
|
}
|