代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPensionAuthRecordVO.java

@@ -27,6 +27,9 @@
    @ApiModelProperty(value = "养老金用户id")
    private Long pensionerId;

    @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸认证）")
    private Integer authMethod;

    @ApiModelProperty(value = "认证期数")
    private String authPeriod;