Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-12-15 b3c3afc2b4af331bbd6ac60f16be9fd6563f7ca0

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java

@@ -36,12 +36,6 @@
   private Long parentId;

   /**
    * 显示顺序
    */
   @ApiModelProperty(value = "显示顺序")
   private String orderNum;

   /**
    * 子部门
    */
   @TableField(exist = false)