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

疯狂的狮子Li

2021-11-28 a627de02c750f6af4c524aff75d28343226f2a82

 .editorconfig

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

[*.java]
indent_style = tab

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