Merge remote-tracking branch 'origin/master'

linwe

2023-11-24 8a28bb397d5743edf1da5930db0d6d0fdd86b35e

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

@@ -70,6 +70,14 @@
   private String url;

   /**
    * 巡查时间
    */
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   @ApiModelProperty("巡查时间")
   private Date patrolTime;

   /**
    * 创建人
    */
   @JsonSerialize(using = ToStringSerializer.class)