Merge branch 'lyq' into 'test'

罗元桥

2021-05-25 b24f9c75c79e4de248505295bfea7055e4975ff4

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

@@ -24,7 +24,7 @@
    private String alley;

    @ExcelProperty(value = "门牌号" ,index = 1)
    private Integer houseNum;
    private String houseNum;

    @ExcelProperty(value = "小区（组）" ,index = 2)
    private String groupAt;