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

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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/base/org/BaseOrgDO.java

yeshijie 4 years ago

parent

36c407b535

commit

1656d74218

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

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