Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子Li

2022-10-12 95010d4a4c21cd53b78f51cbd518a315a8861fbc

 .editorconfig

@@ -10,7 +10,7 @@
trim_trailing_whitespace = true
insert_final_newline = true

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

[*.md]