Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

chenlu

2025-11-21 61cb469ef28b77c1a8f8a2716ff3c4f2180366cd

Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

 .gitignore

@@ -4,7 +4,6 @@
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear


 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-->