Merge branch 'dev'

101captain

2022-03-23 2d0487d82ff61219c71155699b52d8d339a2443a

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java

@@ -60,7 +60,7 @@
    @ApiModelProperty("业务主键 用于跳转")
    private Long businessId;

    @ApiModelProperty("社区活动类型 1志愿者活动 2居民活动")
    @ApiModelProperty("社区活动类型 1志愿者活动 2居民活动 3党建活动")
    private Integer activityType;

}