Merge remote-tracking branch 'origin/master'

HFO4 · HFO4 · commit a00408f33356 · 2022-10-30T11:22:43.000+08:00
diff --git a/src/utils/datetime.js b/src/utils/datetime.js
@@ -14,7 +14,7 @@ try {
     console.log(e);
 }
 
-if (!userTimezone) {
+if (!userTimezone || userTimezone=="Etc/Unknown") {
     userTimezone = "Asia/Shanghai";
 }
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ try {`
`14`	`14`	`console.log(e);`
`15`	`15`	`}`
`16`	`16`
`17`		`-if (!userTimezone) {`
	`17`	`+if (!userTimezone \|\| userTimezone=="Etc/Unknown") {`
`18`	`18`	`userTimezone = "Asia/Shanghai";`
`19`	`19`	`}`
`20`	`20`