Merge remote main, resolve .gitignore and README conflicts
This commit is contained in:
6
.gitignore
vendored
6
.gitignore
vendored
@@ -8,6 +8,7 @@
|
||||
frontend/node_modules
|
||||
frontend/dist
|
||||
frontend/.vite
|
||||
*.tsbuildinfo
|
||||
|
||||
# 后端
|
||||
backend/target
|
||||
@@ -17,3 +18,8 @@ backend/data
|
||||
*.log
|
||||
.jabbarc
|
||||
use-java.ps1
|
||||
|
||||
# 环境变量
|
||||
.env
|
||||
.env.local
|
||||
.env.*.local
|
||||
|
||||
Reference in New Issue
Block a user