Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-09 cd83aadb07d8e1cea473a491066a6c6b0298ce2f

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

@@ -242,5 +242,6 @@
    private Integer codeType;

    @ApiModelProperty("活动类型")
    @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
    private String activityType;
}