Merge remote-tracking branch 'origin/master'

jiangping

2024-10-08 f0a07ef5c374d8fe5519e8ad460ab3d1c85ca776

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

@@ -83,6 +83,7 @@

    @ApiModelProperty(value = "海康门禁名称")
    @ExcelColumn(name="进厂门禁" ,index = 6,width = 12)
    @TableField(exist = false)
    private String deviceName;

    @ApiModelProperty(value = "海康门禁编码")