Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/police/entity/PoliceAffairsGridEntity.java

@@ -30,8 +30,8 @@
    */
   @JsonSerialize(using = ToStringSerializer.class)
   @ApiModelProperty("主键id")
   @TableId(value = "id", type = IdType.AUTO)
   private Integer id;
   @TableId(value = "id", type = IdType.ASSIGN_ID)
   private Long id;
   /**
    * 警务网格编号
    */