Merge remote-tracking branch 'origin/master'

jiangping

2023-12-18 39969f50f23ae92c5fc25005d8d367eea0570c31

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

@@ -95,7 +95,7 @@

    @ApiModelProperty(value = "班次")
    @ExcelColumn(name="班次")
    private String classes;
    private Integer classes;
    @ApiModelProperty(value = "海康门禁名称")
    @ExcelColumn(name="海康门禁名称")
    private String deviceName;