From 7c4b47852e921718259c3e27421f44f8d2edb7fc Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 26 Apr 2021 16:45:52 +0800
Subject: [PATCH] 冲突合并
---
src/views/taskfeedback/taskfeedback.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/taskfeedback/taskfeedback.vue b/src/views/taskfeedback/taskfeedback.vue
index b734535..66239f7 100644
--- a/src/views/taskfeedback/taskfeedback.vue
+++ b/src/views/taskfeedback/taskfeedback.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
--
Gitblit v1.9.3