Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 cb6874174975a370cb60f1557704c9d49a05f9e6

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java

@@ -104,7 +104,7 @@
    private String deviceIndex;
    @ApiModelProperty(value = "入厂时间")
    @ExcelColumn(name="入厂时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date eventDate;

    @ApiModelProperty(value = "访客ID(关联member)")