Merge branch 'master' into dev

xiangpei

2024-07-04 f2e3affd102f6cd98448ef70c12ee3ca81afc659

1
2
3
4
5
[*.{js,jsx,ts,tsx,vue}]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
insert_final_newline = true