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

疯狂的狮子Li

2022-10-13 fde624998f89ee20394bb5a310eaf53c744286f5

 .editorconfig

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

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

[*.md]