Merge remote-tracking branch 'origin/master'

tangzy

2021-08-25 12fd820acec998c56b928907b92beca32e6ae90b

 src/main/java/org/springblade/modules/system/entity/Role.java

@@ -87,7 +87,7 @@
    * 组织机构id
    */
   @TableField("dept_id")
   private Integer deptId;
   private Long deptId;


}