Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/resources/mapper/TabCustomGuideMapper.xml

@@ -240,5 +240,6 @@
     <if test="appid != null and appid != ''">
       and appid = #{appid}
     </if>
+    order by sort
   </select>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/CustomGuideController.java

@@ -52,7 +52,7 @@ public class CustomGuideController {
             guideDTO.setEnterpriseId(enterpriseId);
             guideDTO.setLink(json.getString("link"));
             guideDTO.setCustomLinkType(customLinkType);
-            guideDTO.setSort(json.getInteger("sort"));
+            guideDTO.setSort(i);
             guideDTO.setStatus(json.getInteger("status"));
             guideDTO.setAppid(appId);
             guideDTO.setIconPath(json.getString("iconPath"));