Merge branch 'hemenkou_dev' into dev

101captain

2022-03-02 a934e3e3ae90b2bf7b564426387be5b9343bad07

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

@@ -275,4 +275,7 @@

    @ApiModelProperty("单次活动时长")
    private Integer activityTime;

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