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

lidongdong

2022-10-18 8009e63d71d0cce17c64c70852119ac4a9d71c4d

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

@@ -77,7 +77,7 @@
    private String custodyPerson;

    @ExcelProperty(value = "与监护人关系", index = 19)
    private Integer custodyRelation;
    private String custodyRelation;

    @ExcelProperty(value = "监护人公民身份号码", index = 20)
    private String custodyCardNo;