Merge remote-tracking branch 'origin/master'

k94314517

2024-02-29 16772c5dc27772c2eee57d2eab061ad15e8ad87e

 server/dmvisit_service/src/main/java/com/doumee/dao/system/vo/RetentionVo.java

@@ -40,6 +40,6 @@

    @ApiModelProperty(value = "进场时间")
    @ExcelColumn(name="进场时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date eventDate;
}