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-prod.yml

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

@@ -98,9 +98,9 @@ es:
  type:
    HealthEduArticlePatient: health_edu_article_patient_prod
    Statistics: wlyy_quota_prod
  host: 59.61.92.90
  port: 9065
  tPort: 9066
  host:  59.61.92.90
  port: 9067
  tPort: 9068
  clusterName: jkzl
#消息队列