Merge branch 'master' of http://101.43.194.146:10111/root/supervision-ui

# Conflicts:
#	src/views/medicalhealth/examine2/index.vue