Merge branch 'master' into feature/v1.2.13

entity/workDesktop.go

@@ -456,7 +456,7 @@ func (m *WorkDesktopMenu) CommonlyFormat(childMenus map[int][]*JYMenu) ([]*pb.Th
 		if childMenus[mv.Id] != nil && len(childMenus[mv.Id]) > 0 {
 			childMenu := childMenus[mv.Id]
 			sort.Slice(childMenu, func(i, j int) bool {
-				return childMenu[i].OrderId > childMenu[j].OrderId
+				return childMenu[i].OrderId < childMenu[j].OrderId
 			})
 		L:
 			for _, cv := range childMenu {