From 1d5133b6957d95c0c2b1e9641f21a03d9a1c85bb Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期四, 14 十二月 2023 16:17:12 +0800
Subject: [PATCH] !69 修复升级依赖带来的类型问题 * fix 修复变量问题 * Merge remote-tracking branch 'origin/dev' into dev * update 依赖升级 * update 依赖升级 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance

---
 .editorconfig |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 7034f9b..5b1a804 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,20 +3,19 @@
 
 # 鍖归厤鍏ㄩ儴鏂囦欢
 [*]
-# 璁剧疆瀛楃闆�
-charset = utf-8
 # 缂╄繘椋庢牸锛屽彲閫塻pace銆乼ab
 indent_style = space
 # 缂╄繘鐨勭┖鏍兼暟
 indent_size = 2
+# 璁剧疆瀛楃闆�
+charset = utf-8
 # 缁撳熬鎹㈣绗︼紝鍙�塴f銆乧r銆乧rlf
 end_of_line = lf
 # 鍦ㄦ枃浠剁粨灏炬彃鍏ユ柊琛�
-insert_final_newline = true
-# 鍒犻櫎涓�琛屼腑鐨勫墠鍚庣┖鏍�
 trim_trailing_whitespace = true
+# 鍒犻櫎涓�琛屼腑鐨勫墠鍚庣┖鏍�
+insert_final_newline = true
 
-# 鍖归厤md缁撳熬鐨勬枃浠�
 [*.md]
 insert_final_newline = false
 trim_trailing_whitespace = false

--
Gitblit v1.9.3