From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 .gitignore |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e5b16e..d548b89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,13 +4,37 @@
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
 *.ear
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
-# Ignore .idea files
-**/.idea/
+# Ignore .idea files**/.idea/
 ../idea/*
+**/target/
+/north-glass-erp/erp.iml
+
+/north-glass-erp/src/test/test.iml
+
+/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+/north-glass-erp/.idea/.gitignore
+/north-glass-erp/.idea/compiler.xml
+/north-glass-erp/.idea/dataSources.xml
+/north-glass-erp/.idea/encodings.xml
+/north-glass-erp/.idea/google-java-format.xml
+/north-glass-erp/.idea/inspectionProfiles/Project_Default.xml
+/north-glass-erp/.idea/jarRepositories.xml
+/north-glass-erp/.idea/jsLibraryMappings.xml
+/north-glass-erp/.idea/misc.xml
+/north-glass-erp/.idea/north-glass-erp.iml
+/north-glass-erp/.idea/sqldialects.xml
+/north-glass-erp/.idea/uiDesigner.xml
+/north-glass-erp/.idea/vcs.xml
+/north-glass-erp/northglass-erp/public/*.apk
+/north-glass-erp/.idea
+/north-glass-erp/src/.idea
+/north-glass-erp/src/main/main.iml
+/north-glass-erp/northglass-erp/config.js
+/north-glass-erp/northglass-erp/src/stores/sd/companyInfo.js
+

--
Gitblit v1.8.0