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

gateway/ag-basic/src/main/resources/application.yml

@@ -77,6 +77,9 @@ zuul:
    svr-internet-hospital-entrance:
      path: /hospitalEntrance/**
      serviceId: svr-internet-hospital-entrance
    svr-door-service:
      path: /doorService/**
      serviceId: svr-door-service
#---
#spring: