Merge branch 'groupmealweb' of http://10.2.1.24:10244/zhaoy/BPA.SAAS.Web into groupmealweb

.vs/VSWorkspaceState.json

@@ -2,6 +2,6 @@
   "ExpandedNodes": [
     ""
   ],
-  "SelectedNode": "\\config",
+  "SelectedNode": "\\package.json",
   "PreviewInSolutionExplorer": false
 }

config/routes.js

@@ -111,6 +111,13 @@ export default [
     icon: 'DropboxSquareFilled',
     path: '/database',
     routes: [
+      {
+        name: '配方管理',
+        icon: 'smile',
+        path: '/database/basic/bom',
+        component: './database/basic/bom',
+        access: 'k7',
+      },
       {
         name: '物料管理',
         icon: 'smile',
@@ -264,7 +271,13 @@ export default [
     path: '/groupMeal/shop',
     icon: 'SettingOutlined',
     name: '团餐场景管理',
-    component: './groupMeal/shop',
+    routes: [
+      {
+        name: '会员信息',
+        icon: 'smile',
+        path: '/groupMeal/shop',
+        component: './groupMeal/shop',
+      }]
   },
   {
     name: '团餐会员管理',

src/pages/org/users/index.jsx

@@ -229,7 +229,6 @@ const userManager = () => {
   }, []);
   function initfranchiseeType() {
     api.gettree2().then((r) => {
-      debugger
       setTreeData(r.data);
     });api
   }