Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-system/src/main/java/com/zkqy/system/service/impl/SysTenantServiceImpl.java

@@ -1286,6 +1286,31 @@ public class SysTenantServiceImpl implements ISysTenantService
                 "        \"updateBy\": null,\n" +
                 "        \"updateTime\": null,\n" +
                 "        \"remark\": null,\n" +
+                "        \"menuId\": 6199,\n" +
+                "        \"menuName\": \"待办审批\",\n" +
+                "        \"parentName\": null,\n" +
+                "        \"parentId\": 0,\n" +
+                "        \"orderNum\": 3,\n" +
+                "        \"path\": \"OAMange\",\n" +
+                "        \"component\": \"bussiness/OAMange\",\n" +
+                "        \"query\": null,\n" +
+                "        \"isFrame\": \"1\",\n" +
+                "        \"isCache\": \"0\",\n" +
+                "        \"menuType\": \"C\",\n" +
+                "        \"visible\": \"0\",\n" +
+                "        \"status\": \"0\",\n" +
+                "        \"perms\": \"\",\n" +
+                "        \"icon\": \"bpmn-icon-end-event-link\",\n" +
+                "        \"children\": [],\n" +
+                "        \"tenantName\": null,\n" +
+                "        \"tenantId\": null\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"createBy\": null,\n" +
+                "        \"createTime\": \"2023-10-11 09:28:10\",\n" +
+                "        \"updateBy\": null,\n" +
+                "        \"updateTime\": null,\n" +
+                "        \"remark\": null,\n" +
                 "        \"menuId\": 4218,\n" +
                 "        \"menuName\": \"生产任务\",\n" +
                 "        \"parentName\": null,\n" +

zkqy-system/src/main/resources/sql/initialize_sys_tenant_menu.json

@@ -1099,6 +1099,31 @@
         "tenantName": null,
         "tenantId": null
     },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 6199,
+        "menuName": "待办审批",
+        "parentName": null,
+        "parentId": 0,
+        "orderNum": 3,
+        "path": "OAMange",
+        "component": "bussiness/OAMange",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "bpmn-icon-end-event-link",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
     {
         "createBy": null,
         "createTime": "2023-10-11 09:28:10",