Merge branch 'master' into 2.7.0

648540858

2024-03-28 53d4d10e1c5b346f01501b3ba5f10beccb2f3864

 web_src/build/webpack.base.conf.js

@@ -27,6 +27,7 @@
    alias: {
      'vue$': 'vue/dist/vue.esm.js',
      '@': resolve('src'),
      '@static': resolve('static'),
    }
  },
  module: {