Merge branch 'demo_' of http://124.71.196.186:8888/hfxc226/hitch-manage into demo_

platform-dao/src/main/java/com/platform/dao/pojo/TreeNode.java

@@ -49,6 +49,10 @@ public class TreeNode implements Serializable {
      * 自定义class
      */
     private String clazz;
+    /**
+     * 自定义字段
+     */
+    private Integer type;
 
     /**
      * 添加节点

platform-dao/src/main/java/com/platform/dao/util/TreeUtil.java

@@ -470,9 +470,10 @@ public class TreeUtil {
             CommonTree node = new CommonTree();
             node.setId(type.getId());
             node.setKey(type.getId());
-            node.setSort(type.getSort());
+            node.setType(type.getType());
             node.setParentId(type.getParentId());
             node.setTitle(type.getName());
+            node.setSort(type.getSort());
             node.setImg(type.getOpcImg());
             node.setValue(type.getId());
             trees.add(node);