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

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

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

@@ -31,7 +31,7 @@ wlyy:
  hospital: 49229004X # 默认医院code
im:
  im_list_get: http://11.1.2.27:3000
  im_list_get: http://11.1.2.27:3000/
  data_base_name: im
#物联网配置

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

@@ -31,7 +31,7 @@ wlyy:
  hospital: 49229004X # 默认医院code
im:
  im_list_get: http://11.1.2.27:3000
  im_list_get: http://11.1.2.27:3000/
  data_base_name: im
#物联网配置