合并分支 'qa' 到 'master'

src/main/java/com/sfa/common/core/web/domain/TreeEntity.java

@@ -19,7 +19,7 @@ public class TreeEntity extends BaseEntity
     private Long parentId;
 
     /** 显示顺序 */
-    private Integer orderNum;
+    private Long orderNum;
 
     /** 祖级列表 */
     private String ancestors;
@@ -47,12 +47,12 @@ public class TreeEntity extends BaseEntity
         this.parentId = parentId;
     }
 
-    public Integer getOrderNum()
+    public Long getOrderNum()
     {
         return orderNum;
     }
 
-    public void setOrderNum(Integer orderNum)
+    public void setOrderNum(Long orderNum)
     {
         this.orderNum = orderNum;
     }