Merge branch 'huacheng' into huacheng_test

101captain

2022-06-21 47589b52112f37e4366f96a7f13c6d99bbacdc77

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

@@ -165,6 +165,9 @@
    @ApiModelProperty("户籍地")
    private String registerResidence;

    @ApiModelProperty("是否学生")
    private String isStudent;


    public interface type{
        int zj=1;