Merge remote-tracking branch 'origin/dev' into dev

huanghongfa

2022-03-07 bf71f1fd72fa08204b67bd14a656890015b75247

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

@@ -246,6 +246,9 @@

    private String areaCode;

    @ApiModelProperty("单次活动时长（小时）")
    private Integer duration;

    @ApiModelProperty("项目Id")
    private Long projectId;

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

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

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