Merge branch 'feature/10月迭代' into dev

build/webpack.dev.conf.js

@@ -55,8 +55,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: 'index.html',
-      inject: true,
-      favicon: './favicon.ico'
+      inject: true
     }),
     // copy custom static assets
     new CopyWebpackPlugin([

build/webpack.prod.conf.js

@@ -63,6 +63,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     new HtmlWebpackPlugin({
       filename: config.build.index,
       template: 'index.html',
+      favicon: './favicon.ico',
       inject: true,
       minify: {
         removeComments: true,