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/common/partfamily.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/common/partfamily.vue b/src/views/common/partfamily.vue
index a9f8133..375de34 100644
--- a/src/views/common/partfamily.vue
+++ b/src/views/common/partfamily.vue
@@ -9,7 +9,7 @@
       :uploadInfo="uploadInfo"
       :prelang="prelang"
       :options="options"
-      :bottomOffset="255"
+      :bottomOffset="150"
       :ajaxFun="ajaxFun"
       ref="commonPartFamilyTable"
     >

--
Gitblit v1.9.3