Merge branch 'dev'

101captain

2022-03-14 85cf42314fc04a637f1a44e78c1e476a445bf0f3

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

@@ -88,4 +88,13 @@
    @ApiModelProperty("签到结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endTime;

    @ApiModelProperty("1签到 2签退")
    private Integer signType;

    @ApiModelProperty("时长")
    private Integer duration;

    @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
    private Integer status;
}