合并冲突

licp

2024-04-03 67d2338b3dd43c5972159822aa3dd8f53cd3c78b

 src/components/view/a6-device-overview.vue

@@ -288,6 +288,9 @@
                this.finishLoding = true;
              }
              this.list = this.list.concat(list)
              if(this.total==this.list.length){
                this.finishLoding = true;
              }
            }
          }
          this.loading = false