Merge remote-tracking branch 'origin/master'

lin

2024-05-09 b822ea020a6d4edec0d183af32532076cdca062c

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

@@ -58,4 +58,9 @@
   @ApiModelProperty(value = "是否已删除 0： 否 1：是", example = "")
   @TableField("is_deleted")
   private Integer isDeleted;

   /** 1.自查 2.无诈 */
   @ApiModelProperty(value = "1.自查 2.无诈", example = "")
   @TableField("type")
   private Integer type;
}