Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into script_gj

# Conflicts:
#	projects/fangjia-script/pom.xml
This commit is contained in:
2026-01-09 14:40:24 +08:00
97 changed files with 1673 additions and 193 deletions
+3
View File
@@ -602,8 +602,11 @@
<!-- <artifactId>mysql-connector-java</artifactId>-->
<!-- <version>8.0.33</version>-->
<!-- </dependency>-->
<<<<<<< HEAD
=======
>>>>>>> 0f09380b841eb4db196b8a3ad66beb5d3d06e7f9
</dependencies>
</project>