Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

Conflicts:
	patient-co/patient-co-wlyy/src/main/resources/application.yml

patient-co/patient-co-wlyy/src/main/resources/application-test.yml

@@ -98,7 +98,7 @@ es:
  index:
    HealthEduArticlePatient: health_edu_article_patient_test
  type:
    health_edu_article_patient: health_edu_article_patient_test
    HealthEduArticlePatient: health_edu_article_patient_test
  host: 172.19.103.68
  port: 9200
  tPort: 9300