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 | 1 -
north-glass-erp/pom.xml | 6 ++++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7242f8c..d548b89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
.mtj.tmp/
# Package Files #
-*.jar
*.war
*.ear
diff --git a/north-glass-erp/pom.xml b/north-glass-erp/pom.xml
index 71a612a..9d312ae 100644
--- a/north-glass-erp/pom.xml
+++ b/north-glass-erp/pom.xml
@@ -164,9 +164,11 @@
</dependency>
<dependency>
- <groupId>com.aspose</groupId>
- <artifactId>aspose-cad</artifactId>
+ <groupId>com.example</groupId>
+ <artifactId>lib</artifactId>
<version>21.11</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/resources/lib/aspose-cad-21.jar</systemPath>
</dependency>
<!--redis-->
--
Gitblit v1.8.0