代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageElderAuthRecordsDTO.java

@@ -49,4 +49,7 @@

    @ApiModelProperty(value = "社区ID", hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证 3.线下认证）")
    private String authMethod;
}