From ff1ccc39f1789a3e00f1662208f9c38ed1a7c4b8 Mon Sep 17 00:00:00 2001
From: gyj <gaoyj@aliyun.com>
Date: Wed, 21 Feb 2024 11:29:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/caseManagement/caseList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue
index 0fafc83..2e68d9c 100644
--- a/src/views/caseManagement/caseList.vue
+++ b/src/views/caseManagement/caseList.vue
@@ -33,7 +33,7 @@
         </el-form>
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addCase()">新增案件</el-button>
+                <el-button type="primary" plain icon="el-icon-plus"  v-hasPermi="['caseManagement:list:add']" size="mini" @click="addCase()">新增案件</el-button>
             </el-col>
             <!-- TODO 后期可能加上-->
             <!-- <el-col :span="1.5">

From f1187ea4a1d352e4616d55e28c26d57ed6d270fb Mon Sep 17 00:00:00 2001
From: gyj <gaoyj@aliyun.com>
Date: Wed, 21 Feb 2024 11:37:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 39a6a43..67d42b9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -14,18 +14,11 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 // const API = 'http://121.40.189.20:9001'  //生产
 const API = 'http://121.40.189.20:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
-<<<<<<< HEAD
 // const API = 'http://172.16.0.237:6001' //Q
 // const API = 'http://172.16.1.43:6001' //w
-=======
 // const API = 'http://172.16.1.30:6001' //Q
-<<<<<<< HEAD
 // const API = 'http://172.16.1.43:6001' //w
-=======
 // const API = 'http://172.16.1.17:6001' //w
->>>>>>> 14df1eebfbde9573a5c541678ad9dfbb33797007
->>>>>>> 2fbaf17b60f7f1acb11b1a884129643927270d1b
-
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档