合并冲突

licp

2024-05-27 e59a71579f6afd21c76f9d45c3b3f09c28d03c41

 src/components/view/b4-sample-defects.vue

@@ -73,6 +73,7 @@
      <el-table
        :data="tableData"
        style="width: 100%;margin-bottom: 10px;height: calc(100% - 40px);"
        height="calc(100% - 40px)"
        row-key="id"
        v-loading="loading"
        border