Merge remote-tracking branch 'origin/master'

jiangping

2023-12-28 48376938fb04165594a51a8847987669cd80fc63

 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;