From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/system/department/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue
index 16fc3be..56443be 100644
--- a/src/views/system/department/index.vue
+++ b/src/views/system/department/index.vue
@@ -2,7 +2,7 @@
<div class="system-dept-container">
<el-card shadow="hover">
<div class="system-dept-search mb15">
- <el-input size="default" placeholder="请输入部门名称" style="max-width: 180px"> </el-input>
+ <!-- <el-input size="default" placeholder="请输入部门名称" style="max-width: 180px"> </el-input>-->
<el-button size="default" type="primary" class="ml10">
<el-icon>
<ele-Search />
--
Gitblit v1.9.2