Merge remote-tracking branch 'origin/master'

zss

2023-08-18 6170908b69269ee14eae05787eafe682fda00eef

 pom.xml

@@ -22,7 +22,8 @@
        <module>inspect-server</module>
        <module>inventory-server</module>
        <module>system-run</module>
        <module>sale-server</module>
        <module>production-server</module>
        <module>base-server</module>
    </modules>

    <properties>
@@ -37,7 +38,7 @@
        <openfeign.version>3.1.3</openfeign.version>
        <feign-okhttp.version>11.0</feign-okhttp.version>
        <shiro.version>1.5.3</shiro.version>
        <velocity-engine.version>2.3</velocity-engine.version>
        <freemwork.version>2.3.32</freemwork.version>
        <!--提交前-->
        <!-- 打包后导出的路径 -->
        <package.path>${project.build.directory}/BLOG</package.path>
@@ -126,6 +127,13 @@
                <version>${mybatis-plus.version}</version>
            </dependency>

            <!--代码生成器模板-->
            <dependency>
                <groupId>org.freemarker</groupId>
                <artifactId>freemarker</artifactId>
                <version>${freemarker.version}</version>
            </dependency>

            <!--feign-->
            <dependency>
                <groupId>org.springframework.cloud</groupId>
@@ -145,13 +153,6 @@
                <groupId>org.apache.shiro</groupId>
                <artifactId>shiro-spring-boot-starter</artifactId>
                <version>${shiro.version}</version>
            </dependency>

            <!-- 代码生成器模板，用于生成代码 -->
            <dependency>
                <groupId>org.apache.velocity</groupId>
                <artifactId>velocity-engine-core</artifactId>
                <version>${velocity-engine.version}</version>
            </dependency>
        </dependencies>
    </dependencyManagement>