chore: resolve conflict

server/config.js

@@ -18,5 +18,7 @@ module.exports = {
   port: port,
   API_INTERNAL_URI: API_INTERNAL_URI[env],
   PANDORA_URI: PANDORA_URI[env],
-  GOODS_URI: API_INTERNAL_URI[env]
+  GOODS_URI: API_INTERNAL_URI[env],
+  WITHDRAWAL_URI: API_INTERNAL_URI[env],
+  GROUPMEAL_URI: API_INTERNAL_URI[env],
 };

src/router/index.js

@@ -10,7 +10,7 @@ import AddRole from "../pages/Role/add-role.vue";
 import ManageRole from "../pages/Role/manage-role.vue";
 import RoleDetail from "../pages/Role/role-detail.vue";
 import goodsRouter from "./Goods/index";
-
+import groupmealRouters from "./Groupmeal/index";
 const routes = [
   {
     path: "/op/enterprise",
@@ -113,7 +113,9 @@ const routes = [
     }
   },
   // 商品管理路由
-  ...goodsRouter
+  ...goodsRouter,
+  // 团餐运营
+  ...groupmealRouters
 ];
 console.log(routes);