'代码合并'

2022-03-03 17:22:13 +08:00
parent f14efa2612 ae0c4aea12
commit 441cb6ddcb
42 changed files with 1357 additions and 39 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,11 @@

    <properties>
        <java.version>1.8</java.version>
+<<<<<<< HEAD
        <revision>4.3.0</revision>
+=======
+        <revision>4.2.4</revision>
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <skipTests>true</skipTests>