Merge remote-tracking branch 'origin/uiUptate0629' into testNew

webpack.config.js

@@ -325,7 +325,7 @@ module.exports = {
           loader: 'file-loader',
           options: {
             outputPath: 'images/', // 图片输出的路径和存储路径保持一致
-            limit: 9000,
+            limit: 12000,
             name: '[name].[ext]'
           }
         }