Merge branch 'release-4.14.4' into test

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoExtServiceImpl.java

@@ -232,9 +232,8 @@ public class SceneEditInfoExtServiceImpl extends ServiceImpl<ISceneEditInfoExtMa
                 jsonObject.remove("createTime");
                 return jsonObject;
             }).collect(Collectors.toList());
-            this.sortIcons(tags, styles);
         }
-        result.put("styles", styles);
+        result.put("styles", this.sortIcons(tags, styles));
 
         return result;
     }