Merge remote-tracking branch 'origin/master'

2 years ago · a1ecda9d54
parent 5a1b485cdd e017387c9a
commit a1ecda9d54
1 changed files with 1 additions and 1 deletions
--- a/subPackWork/equipmentManagement/equipmentDetails.vue
+++ b/subPackWork/equipmentManagement/equipmentDetails.vue
@ -9,7 +9,7 @@
 				<common-title :title="'基础信息'"></common-title>
 				<view class="content-detail">
 					<uni-list>
-						<uni-list-item title="设备类型" :rightText="datas.type" />
+						<uni-list-item title="设备类型" :rightText="datas.typeName" />
 						<uni-list-item title="设备名称" :rightText="datas.resourceName" />
 						<uni-list-item title="设备编码" :rightText="datas.resourceCode" />
 						<uni-list-item title="设备品牌" :rightText="datas.devBrandName" />