From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突

---
 src/views/plan/customerorder/confirm-pull-customerorder.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/plan/customerorder/confirm-pull-customerorder.vue b/src/views/plan/customerorder/confirm-pull-customerorder.vue
index 2f3c9ae..9685249 100644
--- a/src/views/plan/customerorder/confirm-pull-customerorder.vue
+++ b/src/views/plan/customerorder/confirm-pull-customerorder.vue
@@ -70,7 +70,7 @@
           })
           .catch((error) => {
             this.isSubmit = false
-            console.log(error)
+            console.error(error)
           })
       } else {
         this.isSubmit = false

--
Gitblit v1.9.3