Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
0101439232
1 changed files with 2 additions and 2 deletions
|
@ -498,7 +498,7 @@ func NewFormattedValueDate(content, content2 int64, format DateFormat, isNotTime
|
|||
Content: content,
|
||||
Content2: content2,
|
||||
HasEndDate: false,
|
||||
IsNotTime: true,
|
||||
IsNotTime: isNotTime,
|
||||
FormattedContent: formatted,
|
||||
}
|
||||
return
|
||||
|
@ -535,7 +535,7 @@ func NewFormattedValueDate(content, content2 int64, format DateFormat, isNotTime
|
|||
IsNotEmpty: true,
|
||||
IsNotEmpty2: !content2Time.IsZero(),
|
||||
HasEndDate: hasEndDate,
|
||||
IsNotTime: true,
|
||||
IsNotTime: isNotTime,
|
||||
FormattedContent: formatted,
|
||||
}
|
||||
return
|
||||
|
|
Loading…
Add table
Reference in a new issue