Merge branch 'huacheng' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ i...

101captain

2022-04-13 2c7d6db898705a26274d93b703156d1446edad3d

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

@@ -41,8 +41,8 @@
    @ExcelProperty(value = "照片", index = 6)
    private String photo;

    @ExcelProperty(value = "户籍性质（1.城镇户口 2.农村户口）", index = 7)
    private Integer regiterNature;
    @ExcelProperty(value = "户籍性质", index = 7)
    private String regiterNature;

    @ExcelProperty(value = "户口所在地", index = 8)
    private String censusRegister;