168.1.220:10080/Amoy2/wlyy2.0 into dev · 13e3b8ca52 - Gogs: Go Git Service

Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

Conflicts:
	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/CapacityAssessmentRecordService.java

yeshijie 4 jaren geleden

bovenliggende

aaa04bf814

commit

13e3b8ca52

1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen

Zij-aan-zij weergave Toon Diff Stats

						
							+ 1
							
							- 1
						
svr/svr-cloud-care/src/main/resources/bootstrap.yml
							 
								Bestand weergeven
							
				@ -1,6 +1,6 @@
			
				spring:
			
				  application:
			
				    name:  svr-cloud-care-ysj
			
				    name:  svr-cloud-care
			
				  cloud:
			
				    config:
			
				      failFast: true