From 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 17 十一月 2024 11:31:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 .gitignore |   64 ++++++++++----------------------
 1 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed8368a..78a752d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,47 +1,23 @@
-######################################################################
-# Build Tools
-
-.gradle
-/build/
-!gradle/wrapper/gradle-wrapper.jar
-
-target/
-!.mvn/wrapper/maven-wrapper.jar
-
-######################################################################
-# IDE
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### JRebel ###
-rebel.xml
-
-### NetBeans ###
-nbproject/private/
-build/*
-nbbuild/
+.DS_Store
+node_modules/
 dist/
-nbdist/
-.nb-gradle/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+**/*.log
 
-######################################################################
-# Others
-*.log
-*.xml.versionsBackup
-*.swp
+tests/**/coverage/
+tests/e2e/reports
+selenium-debug.log
 
-!*/build/*.java
-!*/build/*.html
-!*/build/*.xml
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.local
+
+package-lock.json
+yarn.lock

--
Gitblit v1.9.1