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

疯狂的狮子li

2022-09-13 8c9c52417e69af15638768704b0b53ba98482069

 .editorconfig

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

[*.java]
indent_style = tab

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