From 07fa589e06415ca41fc29d22c7c8f3f1b4917147 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:42:32 +0800
Subject: [PATCH] 处理冲突
---
web_src/build/webpack.base.conf.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/web_src/build/webpack.base.conf.js b/web_src/build/webpack.base.conf.js
index a07e683..72539e3 100644
--- a/web_src/build/webpack.base.conf.js
+++ b/web_src/build/webpack.base.conf.js
@@ -27,6 +27,7 @@
alias: {
'vue$': 'vue/dist/vue.esm.js',
'@': resolve('src'),
+ '@static': resolve('static'),
}
},
module: {
--
Gitblit v1.8.0