Merge branch 'baiyanting1' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into new-power

src/components/lightDetial/index.vue

@@ -25,7 +25,7 @@
           </div>
           <!-- <div class="wt-info">厂商名称：{{ otherInfo?.manufacturer }}</div> -->
           <div class="wt-xh" @click="handleXhClick(wtInfo)">
-            设备型号：{{ otherInfo?.model }}
+            设备型号：{{otherInfo?.manufacturer}} ( {{ otherInfo?.model }} )
           </div>
         </div>
         <img

src/components/windDetail/index.vue

@@ -9,7 +9,7 @@
           </div> -->
           <div class="ps-info" @click="handleXhClick(windInfo)">
             <div class="ps-title">设备型号:</div>
-            <div class="ps-name">{{ otherInfo?.model }}</div>
+            <div class="ps-name">{{otherInfo?.manufacturer}} ( {{ otherInfo?.model }} )</div>
           </div>
         </div>
         <div class="info-wrapper">