Merge branch 'hemenkou_dev' into dev

101captain

2022-03-09 9c5b811fb700bc66e66dbf38ed8733e57a4edac6

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

@@ -57,5 +57,7 @@
    @ApiModelProperty("纬度")
    private String lat;

    private String areaCode;

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