Merge branch 'huacheng' into huacheng_test

101captain

2022-06-21 47589b52112f37e4366f96a7f13c6d99bbacdc77

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

@@ -69,7 +69,7 @@
    private String censusRegister;

    @ExcelProperty(value = "学历", index = 16)
    private Integer cultureLevel;
    private String cultureLevel;

    @ExcelProperty(value = "社区矫正人员编号", index = 17)
    private String correctPersonCode;