Merge branch 'dev-scaleHype-20190428' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-scaleHype-20190428

# Conflicts:
#	src/views/followup/record-manage/models/diabetes/diabetesSourseAuxiliary.js