Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-27 2a5dff9ff1af974d6bda826da75ca8073c25013f

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

@@ -35,5 +35,11 @@
    @ApiModelProperty("咨询电话")
    private String phone;

    @ApiModelProperty("经度")
    private String lon;

    @ApiModelProperty("纬度")
    private String lat;

    private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}