Merge branch 'test_bak' into 'master'

罗元桥

2021-09-29 161b77a90e4743a96b083a0653c3ae4b8245f589

 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;