Merge remote-tracking branch 'origin/master'

k94314517

2024-09-12 f02fde734aba50a4d5b5f89d88c075e6e93cb499

 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 {