From b8adfe3a0a37a8c10f74f2e4159f2e05fb8e296f Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 18 Jan 2023 14:31:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 4e48566..c7d1902 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,17 +1,13 @@
 /*
  * @Author: 李晓鸽 lixg@dongwu-inc.com
  * @Date: 2022-11-21 18:45:34
- * @LastEditors: 李晓鸽 lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 18:47:18
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2023-01-18 14:31:17
  * @FilePath: \stu_h5\vue.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 const { defineConfig } = require('@vue/cli-service')
 module.exports = defineConfig({
-<<<<<<< HEAD
-  publicPath: process.env.VITE_BASE,
-=======
   ppublicPath: process.env.VITE_BASE,
->>>>>>> 3a3701f5d9f534c1d1d845c8bb92acd13581de53
   transpileDependencies: true
 })