Merge remote-tracking branch 'origin/jys7-15' into jys7-15

zj

2024-12-04 a8e2e9ff1040e8668e992b97416eaad21132dae1

 pom.xml

@@ -12,7 +12,7 @@
    <dependency>
      <groupId>org.apache.tomcat</groupId>
      <artifactId>tomcat-catalina</artifactId>
      <version>9.0.70</version>
      <version>8.5.100</version>
      <scope>provided</scope>
    </dependency>

@@ -280,6 +280,7 @@
    </dependency>
  </dependencies>


  <build>
    <finalName>dapp</finalName>
    <plugins>