分支更新

src/views/WindSite/pages/Info/Base-Info.vue

@@ -14,12 +14,8 @@
       </div>
       <div class="wind-site-tag">
         <div class="tag-text">机型</div>
-<<<<<<< HEAD
-        <div class="tag-value">{{ sourceMap.model }}</div>
-=======
         <div class="tag-value">{{sourceMap.model}}</div>
->>>>>>> f57ac2ddb5613fc5ee68772d0b230fab4e19a55c
-      </div>
+        </div>
       <div class="wind-site-tag">
         <div class="tag-text">告警时间</div>
         <div class="tag-value">{{ sourceMap.gxkmap && sourceMap.gxkmap.bjsj }}</div>