Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 fd3453d1d6cd98be518edf793d9db50c06c726b1

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java

@@ -108,7 +108,7 @@
    private String personPhone;

    @ApiModelProperty(value = "人员类型")
    private String personType;
    private Integer personType;

    @ApiModelProperty(value = "人员身份证号")
    private String personIdcardDecode;