Merge remote-tracking branch 'origin/master'

src/projects/business/views/Master/Health/AbnormalStatistics.vue

@@ -39,7 +39,7 @@
 						<ul class="mui-table-view mui-table-view-chevron">
 
 							<li class="mui-table-view-cell mui-media" v-for="(item,index) in companyList">
-								<router-link :to="{name: 'HouseKeeperControlHealthAbnormalRecord', query: {companyId: item.id,companyName:doEscape(item.name),filter:1,queryDate:item.date}}"
+								<router-link :to="{name: 'MasterHealthAbnormalRecord', query: {companyId: item.id,companyName:doEscape(item.name),filter:1,queryDate:item.date}}"
 								 class="mui-navigate-right">
 									<div class="mui-media-body">
 										{{item.name}}

src/projects/business/views/Master/Health/Wall.vue

@@ -250,7 +250,7 @@
 			goto(id) {
 
 				this.$router.push({
-					name: 'HouseKeeperControlHealthWorkerTemperature',
+					name: 'MasterHealthWorkerTemperature',
 					query: {
 						id: id
 					}

src/projects/business/views/Master/Health/WorkerTemperature.vue

@@ -147,7 +147,7 @@
 			},
 			doRightLink() {
 				this.$router.push({
-					name: 'HouseKeeperControlHealthNoTemperatureRecord',
+					name: 'MasterHealthNoTemperatureRecord',
 					query: {
 						companyId: this.listForm.companyId,