Merge remote-tracking branch 'origin/master'

zengh

2021-07-29 8ca64d03d58db959d95f49119be0cb322d6edf2f

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

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


}