From abe3a86c15105f215992d78bcaaf9b51efa1d565 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:22:41 +0800
Subject: [PATCH] 解决冲突
---
src/views/equipmentManagement/equipmentList/components/InfoCard.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/equipmentManagement/equipmentList/components/InfoCard.vue b/src/views/equipmentManagement/equipmentList/components/InfoCard.vue
index 785b95f..0e6582a 100644
--- a/src/views/equipmentManagement/equipmentList/components/InfoCard.vue
+++ b/src/views/equipmentManagement/equipmentList/components/InfoCard.vue
@@ -17,7 +17,7 @@
<div class="item">
<div class="label">璁惧绫诲瀷:</div>
- <div class="data">{{ node.devType }}</div>
+ <div class="data">{{ node.devDesc }}</div>
</div>
<div class="item">
--
Gitblit v1.8.0