Merge remote-tracking branch 'origin/master'

jiangping

2024-10-10 a819ee6d472cda32ad335eb4cad0a9f7e4d0878e

 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 {