Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg

shichongfu

2023-06-08 1fe633ce55c6a0e18fdbb7d593a73249b7ecb8bb

 pom.xml

@@ -15,8 +15,6 @@
    <description>product-server</description>
    <modules>
        <module>product-server-web</module>
        <module>product-server-admin</module>
        <module>product-server-org-admin</module>
        <module>home-server-admin</module>
    </modules>
    <properties>
@@ -230,6 +228,11 @@
            <dependency>
                <groupId>com.lx</groupId>
                <artifactId>product-server-admin</artifactId>
                <version>${product-module-version}</version>
            </dependency>
            <dependency>
                <groupId>com.lx</groupId>
                <artifactId>product-server-tool-face</artifactId>
                <version>${product-module-version}</version>
            </dependency>
            <dependency>
@@ -761,5 +764,15 @@
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt</artifactId>
        </dependency>
        <dependency>
            <groupId>org.fusesource</groupId>
            <artifactId>sigar</artifactId>
            <version>1.6.4</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>easyexcel</artifactId>
            <version>2.2.6</version>
        </dependency>
    </dependencies>
</project>