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

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

@@ -1041,12 +1041,62 @@
         "isFrame": "1",
         "isCache": "0",
         "menuType": "C",
-        "visible": "1",
+        "visible": "0",
         "status": "0",
         "perms": "",
         "icon": "button",
         "children": [],
         "tenantName": null,
         "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 4216,
+        "menuName": "管道管理",
+        "parentName": null,
+        "parentId": 0,
+        "orderNum": 1,
+        "path": "processMange",
+        "component": null,
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "M",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "bpmn-icon-end-event-error",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
+    },
+    {
+        "createBy": null,
+        "createTime": "2023-10-11 09:28:10",
+        "updateBy": null,
+        "updateTime": null,
+        "remark": null,
+        "menuId": 4218,
+        "menuName": "管道流程",
+        "parentName": null,
+        "parentId": 4216,
+        "orderNum": 1,
+        "path": "asd",
+        "component": "bussiness/processMange",
+        "query": null,
+        "isFrame": "1",
+        "isCache": "0",
+        "menuType": "C",
+        "visible": "0",
+        "status": "0",
+        "perms": "",
+        "icon": "bpmn-icon-intermediate-event-throw-link",
+        "children": [],
+        "tenantName": null,
+        "tenantId": null
     }
 ]

ruoyi-ui/src/views/tool/datasheet/index.vue

@@ -110,7 +110,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="isPrimary" label="键" width="100">
+          <el-table-column prop="isPrimary" label="主键" width="100">
             <template slot-scope="scope">
               <el-checkbox
                 :disabled="!scope.row.fieldName"