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

101captain

2022-03-03 1ebbd7d5c83cc81e5cf94aa4d2a87a4ecd8a03c3

 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;