Merge branch 'dev'

101captain

2022-03-14 85cf42314fc04a637f1a44e78c1e476a445bf0f3

 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;