Merge branch 'master' into test

puhanshu

2021-12-24 afd27e98fd0d3df475289c56bd96595d81fa5b9b

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

@@ -27,6 +27,9 @@
    @ApiModelProperty("分类名称")
    private String classifyName;

    @ApiModelProperty("图标地址")
    private String pictureUrl;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;