diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
index e728b87..27c4aa2 100644
--- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
+++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
@@ -131,7 +131,6 @@ export default class dnReceiptDom extends BasePage {
   poNo: any = null;
   // 需求数量
   requestAmount: number = null;
-<<<<<<< HEAD
   //receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0];
   async onReady() {
     this.model.DNReceivingList = [];
@@ -141,8 +140,6 @@ export default class dnReceiptDom extends BasePage {
   input() {
     this.receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0];
   }
-=======
->>>>>>> e06fba98009bdb7923f4a67091d1f3e4224bdb07
   // 页面初始化
   // 页面需要清空仓库，因此需要复用该方法
   async initLocation(condition): Promise<LocationDetail[]> {