Merge remote-tracking branch 'origin/master'

k94314517

2024-09-30 af3434a79c2a096105668273cfa27c09eacf6ff1

 admin/src/components/business/OperaDeviceRoleWindow.vue

@@ -158,7 +158,7 @@
    },
    // 获取设备
    getLists () {
      getList({})
      getList({type:0, isdeleted:0 })
        .then(res => {
          this.device = res.map(item => {
            return {