Merge remote-tracking branch 'origin/master'

wangting

2024-11-21 884eab4f434aecba12e6b5227457c645e9558571

 Source/plt-web/plt-web-parent/plt-web/pom.xml

@@ -39,24 +39,6 @@
                    <groupId>com.vci</groupId>
                    <artifactId>plt-web-base</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>com.vci</groupId>
                    <artifactId>plt-poi</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.vci</groupId>
            <artifactId>plt-poi</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-starter-thymeleaf</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>com.vci</groupId>
                    <artifactId>plt-web-base</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>