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

# Conflicts: # Jenkinsfile
测试推送
2024-10-30 18:55:50 +08:00 · 2024-10-30 18:49:58 +08:00
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -1,3 +1,3 @@
@Library('jgpl_6.5') _
 servicePipeline()
-// git lab test2
+// gitea test 2
Author	SHA1	Message	Date
Hoshi	6d583c59b9	Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # Jenkinsfile	2024-10-30 18:55:50 +08:00
Hoshi	eea4fc8b44	测试推送	2024-10-30 18:49:58 +08:00