Merge remote-tracking branch 'origin/master'

k94314517

2024-02-29 16772c5dc27772c2eee57d2eab061ad15e8ad87e

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

@@ -59,16 +59,5 @@
    @ExcelColumn(name="角色编码（关联door_role)")
    private String roleId;

    @ApiModelProperty(value = "海康标识")
    @ExcelColumn(name="海康标识")
    private String hkId;

    @ApiModelProperty(value = "海康同步状态 0未同步 1已同步")
    @ExcelColumn(name="海康同步状态 0未同步 1已同步")
    private Integer hkStatus;

    @ApiModelProperty(value = "海康最近同步时间")
    @ExcelColumn(name="海康最近同步时间")
    private Date hkDate;

}