Merge remote-tracking branch 'origin/huacheng_test' into huacheng_zts

张天森

2022-07-11 8ef6cc463ec3e1c7f7164bcfe19c383214cb5db4

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

@@ -167,6 +167,8 @@

    @ApiModelProperty("是否学生")
    private String isStudent;
    @ApiModelProperty("证件类型")
    private String cardType;


    public interface type{