Merge remote-tracking branch 'origin/origin/main' into origin/main

src/pages-charge/machines/machines.vue

@@ -136,7 +136,7 @@
           :key="index"
       >
         <ChargeMachine
-            :title="'NO.' + item.equipmentId"
+            :title="'NO.' + item.shortId"
             :price="station.totalFee"
             :list="[item]"
             :parkingNo="item.parkingNo"