Merge from dev branch to master #2

Merged

FatttSnake merged 2 commits from dev into master

2023-09-04 23:26:47 +08:00

Author	SHA1	Message	Date
FatttSnake	da443c2d7e	Merge pull request 'Fix build failure' (#1 ) from FatttSnake into dev Reviewed-on: FatttSnake/fatweb-ui#1	2023-09-04 22:38:23 +08:00
FatttSnake	5ee80f409f	Fix build failure	2023-09-04 22:35:52 +08:00