From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/src/views/plan/customerorder/customerorder-config-history.vue b/src/views/plan/customerorder/customerorder-config-history.vue
index f6cce3b..67c35eb 100644
--- a/src/views/plan/customerorder/customerorder-config-history.vue
+++ b/src/views/plan/customerorder/customerorder-config-history.vue
@@ -27,7 +27,7 @@
       :uploadInfo="uploadInfo"
       :prelang="prelang"
       :options="options"
-      :bottomOffset="350"
+      :bottomOffset="150"
       :ajaxFun="ajaxFun"
       :paramObj="paramObj"
       ref="commonPartTable"

--
Gitblit v1.9.3