Merge remote-tracking branch 'origin/master'

zhongrj

2024-02-03 b0f0ed0a1cb771c4d1a17e3c8ce90e0cf68cb641

 src/main/java/org/springblade/modules/grid/entity/GridmanEntity.java

@@ -55,6 +55,11 @@
   @ApiModelProperty(value = "网格id")
   private Integer gridId;
   /**
    * 网格编号
    */
   @ApiModelProperty(value = "网格编号")
   private String gridCode;
   /**
    * 关联用户表id
    */
   @ApiModelProperty(value = "关联用户表id")