Merge remote-tracking branch 'origin/alpha' into alpha

web/vite.config.js

@@ -66,6 +66,10 @@ export default defineConfig({
         target: 'http://localhost:3000',
         changeOrigin: true,
       },
+      '/mj': {
+        target: 'http://localhost:3000',
+        changeOrigin: true,
+      },
       '/pg': {
         target: 'http://localhost:3000',
         changeOrigin: true,