Merge branch 'master' into test

puhanshu

2021-12-24 6496d6a229ba8e0acd0777863fb34bee0f5ce717

 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;