From 4ec959d7c2ef1d8dd3af287814ca8a27650b99f7 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 11 一月 2023 15:33:42 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

---
 src/views/systemSetting/device/bayonet/index.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/systemSetting/device/bayonet/index.vue b/src/views/systemSetting/device/bayonet/index.vue
index 4e19321..950f502 100644
--- a/src/views/systemSetting/device/bayonet/index.vue
+++ b/src/views/systemSetting/device/bayonet/index.vue
@@ -198,14 +198,14 @@
 <style lang="scss" scoped>
 .userList {
   text-align: left;
-  margin: 10px 20px;
+  padding: 10px 20px;
   // color: #4b9bb7;
   border: 1px solid #ccc;
   header {
     background-color: white;
 
     .header-content {
-      padding: 0 40px;
+      padding: 0;
       display: flex;
       line-height: 100px;
       justify-content: space-between;
@@ -239,7 +239,7 @@
 
     .main-title {
       line-height: 60px;
-      padding: 10px 20px;
+      padding: 10px 0px;
     }
 
     .tools {

--
Gitblit v1.8.0