优化

2025-07-02 10:58:46 +08:00
parent bbddf6b6ea 64b04286e3
commit f9bc5054be
12 changed files with 121 additions and 196 deletions
--- a/src/views/project/contractorMaterial/component/contractorMaterialRecord.vue
+++ b/src/views/project/contractorMaterial/component/contractorMaterialRecord.vue
@ -22,6 +22,10 @@
        </el-card>
      </div>
    </transition>
+<<<<<<< HEAD
+=======
+
+>>>>>>> 64b04286e36ef42ab8a27f17406454b185d48e80
    <el-card shadow="never">
      <template #header>
        <el-row :gutter="10" class="mb8">