Merge remote-tracking branch 'origin/master'

jiangping

2024-01-09 b59fc5522771bba6b5cae1ff7f7f0a47fd3f8584

 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;