Merge remote-tracking branch 'origin/test' into test

2025-10-13 15:37:04 +08:00
parent e556fb9397 b42265dc81
commit 848015ad26
40 changed files with 2669 additions and 78 deletions
--- a/zt-module-qms/zt-module-qms-server/pom.xml
+++ b/zt-module-qms/zt-module-qms-server/pom.xml
@@ -110,6 +110,12 @@
        <dependency>
            <groupId>com.zt.plat</groupId>
            <artifactId>zt-spring-boot-starter-test</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>

        <!-- 工具类相关 -->