Merge remote-tracking branch 'origin/master'

lin

2024-04-23 2be4713d25c0a295e3f84772dfc3faa0e4930ed2

 src/main/java/org/springblade/modules/patrol/entity/PatrolGroupItem.java

@@ -34,7 +34,7 @@
   /** 内容组id */
   @ApiModelProperty(value = "内容组id", example = "")
   @TableField("group_id")
   private Integer groupId;
   private Long groupId;

   /** 名称 */
   @ApiModelProperty(value = "名称", example = "")