Merge remote-tracking branch 'origin/master'

luxiaotao1123

2024-12-26 d14e77e0da0db122867500fecf6d0607ef4d3bd5

 zy-acs-fake/pom.xml

@@ -18,7 +18,6 @@
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
        <mysql-driver.version>5.1.47</mysql-driver.version>
    </properties>