Browse Source

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

Conflicts:
	svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/CreditsDetailService.java
yeshijie 4 years ago
parent
commit
992f141e85

svr/svr-door-serivce/src/main/resource/application.yml → svr/svr-door-serivce/src/main/resources/application.yml


svr/svr-door-serivce/src/main/resource/banner.txt → svr/svr-door-serivce/src/main/resources/banner.txt


svr/svr-door-serivce/src/main/resource/bootstrap.yml → svr/svr-door-serivce/src/main/resources/bootstrap.yml