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/ComMngPopulationExcelVo.java

@@ -18,7 +18,7 @@
    private String personType;

    @ExcelProperty(value = "人员标签", index = 3)
    private String label;
    private String tags;

    @ExcelProperty(value = "居住地址", index = 4)
    private String address;