Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

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

@@ -21,10 +21,10 @@
    @ExcelProperty(value = "小区名称", index = 1)
    private String villageName;

    @ExcelProperty(value = "门牌号", index = 2)
    @ExcelProperty(value = "街路巷号", index = 2)
    private String doorNo;

    @ExcelProperty(value = "楼栋号/楼栋名称", index = 3)
    @ExcelProperty(value = "楼栋号", index = 3)
    private String name;

//    @ExcelProperty(value = "单元数", index = 6)