代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

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

@@ -27,5 +27,4 @@
    @ApiModelProperty("农村小区数量")
    private Integer countrysideTotal = 0;


}