Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

 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;