Merge remote-tracking branch 'origin/master'

无关风月

2024-08-20 9f88b12d16c83963dad8fb8f79d9eeba2c311518

 guns-management/src/main/java/com/stylefeng/guns/modular/system/model/Role.java

@@ -35,7 +35,6 @@
    /**
     * 序号
     */
   @ApiModelProperty(value = "排序", required = true)
   private Integer num;
    /**
     * 父角色id
@@ -58,6 +57,8 @@

   @TableField("insert_time")
   private Date insertTime;
   @TableField("create_by")
   private Integer createBy;