From 8cd95b47b1c19385b1d991c5db099350e4e45be0 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Mon, 21 Oct 2019 14:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                           | 3 ++-
 src/views/modules/api/scanswitch.vue | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d98e58c2..3796783a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@
 hs_err_pid*
 node_modules
 dist
-epdc-admin
\ No newline at end of file
+epdc-admin
+.idea/
\ No newline at end of file
diff --git a/src/views/modules/api/scanswitch.vue b/src/views/modules/api/scanswitch.vue
index 55799795..d1469515 100644
--- a/src/views/modules/api/scanswitch.vue
+++ b/src/views/modules/api/scanswitch.vue
@@ -36,11 +36,7 @@
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="scanSwitch"
-                         label="扫码开关 0关1开"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="delFlag"
-                         label="删除标识  0：未删除    1：删除"
+                         label="开关状态：0-需要扫码；1-不需要扫码"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="createdBy"