Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 682cdc31720043e96a220da017328958445b96ed
+  newTag: 1e604eab2bcee2aa18982bbd257519a6ed719187

src/pages/systemManage/limitManage/limitInfo/index.tsx

@@ -19,7 +19,10 @@ const LimitInfo = () => {
   //获取全部菜单
   const getListMenuInfo = () => {
     SystemManageAPI.getListMenuInfo().then(({ result }) => {
-      setAllMenu(result);
+      setAllMenu({
+        ...result,
+        children: result.children?.sort((a, b) => a?.id - b?.id),
+      });
     });
   };
   //根据id获取该角色菜单