From ac0bc1d3df54c8f18a10b135daf28faebb25d20a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 07 八月 2025 16:43:24 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 .gitignore |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 937cf11..1bcc582 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,10 +11,28 @@
 # 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/main
+
 /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

--
Gitblit v1.8.0