diff --git a/src/main/resources/templates/zmquotation/index.html b/src/main/resources/templates/zmquotation/index.html
index aaf6146..8a08f77 100644
--- a/src/main/resources/templates/zmquotation/index.html
+++ b/src/main/resources/templates/zmquotation/index.html
@@ -703,7 +703,7 @@
                     this.$set(this.materialData, this.clickedRowIndex, updatedRow);
                 }
                 this.dialogInventoryVisible = false; // 打开选择盘具的 dialog
-                // 其他逻辑...23123123
+                // 其他逻辑...
             },
 
         },
diff --git a/target/classes/templates/zmquotation/index.html b/target/classes/templates/zmquotation/index.html
index aaf6146..e9a3258 100644
--- a/target/classes/templates/zmquotation/index.html
+++ b/target/classes/templates/zmquotation/index.html
@@ -519,7 +519,10 @@
                 dialogInventoryVisible: false,
                 inventoryTableData: [],
                 clickedRowIndex: null, // 用于记录点击的行的索引
+<<<<<<< HEAD
                 materialTotalRows: 0,
+=======
+>>>>>>> df9601da10f7db0d8609eddc1505f4a6f7a1f427
             }
         },
         computed: {