Merge remote-tracking branch 'origin/master'

zss

2024-01-11 17f0e644be8c98b547f6994a7e827d328e7b532e

 src/views/equipment/metering/index.vue

@@ -68,8 +68,8 @@
        multipleSelection: [],
        uploadInfo: {
          // 是否展示上传EXCEL以及对应的url
          Download:false,
         isShow: true,
          download:false,
          isShow: true,
          url: '/mes/equipmentDevice/upload'
        },
        prelang: 'workstation',