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 |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index ac70f6b..d548b89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
 *.ear
 
@@ -33,3 +32,9 @@
 /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