Merge branch 'huacheng' into huacheng_test

101captain

2022-07-08 2502a5bf8061852d381e3246d5f63e7ff6b0bf78

 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{