Merge branch 'huacheng' into huacheng_test

101captain

2022-07-06 d6578ec702eb4fcff690d71ea3237a885f46b85c

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

@@ -1,11 +1,12 @@
package com.panzhihua.common.model.vos.user;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -59,7 +60,7 @@
    @ApiModelProperty("业务主键 用于跳转")
    private Long businessId;

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

}