Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-09-18 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8

 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 {