Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 33a80f6b0585a320872477f85a50aa10ca1d20b1

 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;