Merge branch 'dev/20201224_2.0.0' into test

src/main/resources/mapper/SysRoleMapper.xml

@@ -36,6 +36,7 @@
                     t3.id AS permissionId,
                     t3.`name` AS permissionName,
                     t2.order_no AS orderNo,
+                    t1.order_nu AS orderNoPermissionId,
                     t1.id AS menuPermissionId
                 FROM
                     sys_menu t2
@@ -54,6 +55,6 @@
         AND t6.permission_id = t4.permissionId
         AND t6.role_id = #{roleId}
         ORDER BY
-            orderNo ASC,menuId ASC,menuPermissionId ASC
+            orderNo ASC,menuId ASC,orderNoPermissionId IS NULL ASC,orderNoPermissionId ASC, menuPermissionId ASC
      </select>
 </mapper>