Merge branch 'develop' of http://58.210.154.140:8888/iidi/backend/bocloud.sms into develop
Conflicts: Jenkinsfiledevelop
						commit
						d753a8b3b9
					
				| 
						 | 
					@ -1,3 +1,3 @@
 | 
				
			||||||
@Library('jgpl_6.5') _
 | 
					@Library('jgpl_6.5') _
 | 
				
			||||||
servicePipeline()
 | 
					servicePipeline()
 | 
				
			||||||
// gitea test
 | 
					// git lab test2
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue