合并冲突

ruoyi-ui/src/views/basecar/car/index.vue

@@ -22,7 +22,6 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['basecar:car:add']"
             icon="Plus"
             plain
             type="primary"

ruoyi-ui/vite.config.js

@@ -31,8 +31,8 @@ export default defineConfig(({mode, command}) => {
             proxy: {
                 // https://cn.vitejs.dev/config/#server-proxy
                 '/dev-api': {
-                    target: 'http://10.11.41.249:8080',
-                    // target: 'http://localhost:8080',
+                    // target: 'http://10.11.41.249:8080',
+                    target: 'http://localhost:8080',
                     changeOrigin: true,
                     rewrite: (p) => p.replace(/^\/dev-api/, '')
                 }