From f4ed5ae8873f65c36b5cf37be264f6ec1e154647 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 20 三月 2024 19:36:58 +0800
Subject: [PATCH] 合并分支冲突解决
---
src/views/supplierManage/index.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/views/supplierManage/index.vue b/src/views/supplierManage/index.vue
index adc8766..2d40ad0 100644
--- a/src/views/supplierManage/index.vue
+++ b/src/views/supplierManage/index.vue
@@ -15,7 +15,6 @@
<style lang="scss" scoped>
.content {
width: 100%;
- background-color: #fff;
- height: calc(100vh - 70px);
+ height: 100%;
}
</style>
--
Gitblit v1.8.0