合并冲突

spring

2025-02-26 d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289

 src/components/do/a6-device/management.vue

@@ -1392,7 +1392,7 @@
            this.componentData.entity.laboratoryName =
              clickNodeVal.parent.label;
          }
          this.componentData.entity.storagePoint = clickNodeVal.label;
          this.componentData.entity.largeCategory = clickNodeVal.label;
        }
        this.refreshTable("page");
      }