Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

 Conflicts:
	src/residentWX/visit/detail/components/HypertensionDetail.vue
	vue.config.js