Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 cb6874174975a370cb60f1557704c9d49a05f9e6

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

@@ -83,8 +83,8 @@
    @ExcelColumn(name="海康标识")
    private String hkId;

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

    @ApiModelProperty(value = "海康最近同步时间")