Merge branch 'dev' of git.mingliqiye.com:mingliqiye/pan-disk into dev

# Conflicts: # .gitignore
2025-06-28 23:41:29 +08:00 · 2025-06-28 23:41:29 +08:00 · 9de51dd7ee
commit 9de51dd7ee
parent 9d476c338b bd846f4273
2 changed files with 1 additions and 2 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,4 +1,4 @@
-[*.{js,jsx,mjs,cjs,ts,tsx,mts,cts,vue,css,scss,sass,less,styl,java}]
+[*.{js,jsx,mjs,cjs,ts,tsx,mts,cts,vue,css,scss,sass,less,styl}]
 charset = utf-8
 indent_size = 2
 indent_style = space
--- a/.gitignore
+++ b/.gitignore
@ -39,6 +39,5 @@ node_modules
 dist
 pnpm-lock.yaml

-src/main/resources/html/**/*
 src/main/resources/html
 log