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

Conflicts:
	svr/svr-patient/src/main/java/com/yihu/jw/patient/service/myFamily/MyFamilyService.java

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

@@ -45,13 +45,13 @@ zuul:
      serviceId: svr-base
    svr-authentication:
      path: /cityihealth/auth/**
      serviceId: svr-authentication-lwb
      serviceId: svr-authentication
    svr-healthy-house:
      path: /cityihealth/healthyHouse/**
      serviceId: svr-healthy-house
    svr-patient:
      path: /cityihealth/patient/**
      serviceId: svr-patient-lwb
      serviceId: svr-patient
---
spring:

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

@@ -1,6 +1,6 @@
spring:
  application:
    name: ag-basic-lwb
    name: ag-basic
  cloud:
    config:
      failFast: true

server/svr-authentication/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-authentication-lwb
    name: svr-authentication
  cloud:
    config:
      failFast: true

svr/svr-patient/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-patient-lwb
    name: svr-patient
  cloud:
    config:
      failFast: true