Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-11-17 81d04fb31f234409229b9e96b5329020cd499f25

 .editorconfig

@@ -10,9 +10,6 @@
trim_trailing_whitespace = true
insert_final_newline = true

[*.java]
indent_style = tab

[*.{json,yml}]
indent_size = 2