Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 a611bfdeb9036d32c3877d43a0dca75bac93ebe4

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

@@ -36,6 +36,9 @@
    @ApiModelProperty("所属分类")
    private Integer classify;

    @ApiModelProperty("所属分类名称")
    private String classifyName;

    @ApiModelProperty("办理时间")
    private String timeAt;

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

    private String areaCode;

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