Merge remote-tracking branch 'origin/master'

jiangping

2024-01-09 b59fc5522771bba6b5cae1ff7f7f0a47fd3f8584

 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;
}