Merge branch 'release-4.14.4' into test

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

@@ -246,7 +246,7 @@ public class SceneEditInfoExtServiceImpl extends ServiceImpl<ISceneEditInfoExtMa
             int count = 0;
             for (JSONObject tag : tags) {
                 String iconUrl = tag.getString("icon");
-                if(StrUtil.isEmpty(iconUrl) || !iconUrl.equals(tag.getString("url"))){
+                if(StrUtil.isEmpty(iconUrl) || !iconUrl.equals(style.getString("url"))){
                     continue;
                 }
                 ++count;
@@ -255,7 +255,7 @@ public class SceneEditInfoExtServiceImpl extends ServiceImpl<ISceneEditInfoExtMa
         }
 
         //排序
-        List<JSONObject> iconList = iconBeans.stream().sorted(Comparator.comparing(IconBean::getCount))
+        List<JSONObject> iconList = iconBeans.stream().sorted(Comparator.comparing(IconBean::getCount).reversed())
                 .map(item -> {
                     return item.getStyle();
                 }).collect(Collectors.toList());