From 61cb469ef28b77c1a8f8a2716ff3c4f2180366cd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 21 十一月 2025 17:37:01 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

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

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