From e59a71579f6afd21c76f9d45c3b3f09c28d03c41 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 14:37:22 +0800
Subject: [PATCH] 合并冲突

---
 src/components/do/b3-work-time-management/work-time-config.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/do/b3-work-time-management/work-time-config.vue b/src/components/do/b3-work-time-management/work-time-config.vue
index 4e38b79..d26142d 100644
--- a/src/components/do/b3-work-time-management/work-time-config.vue
+++ b/src/components/do/b3-work-time-management/work-time-config.vue
@@ -200,7 +200,7 @@
 		margin-top: 10px;
 		background-color: #fff;
 		width: calc(100% - 40px);
-		height: calc(100% - 60px - 80px - 10px - 40px);
+		height: calc(100% - 60px - 80px - 10px - 24px);
 		padding: 20px;
 	}
 </style>

--
Gitblit v1.9.3