From c6ca78efd59710d1564aca05f70d2197f68feb4b Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 19 三月 2025 15:59:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 .gitignore |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7299d97..1bcc582 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,21 @@
 
 /north-glass-erp/src/test/test.iml
 
-/north-glass-erp/.idea/libraries
+/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