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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java

@@ -1,12 +1,13 @@
package com.panzhihua.common.model.vos.partybuilding;

import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;

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

import java.util.Date;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -16,8 +17,7 @@
 **/
@Data
@ApiModel("党员活动")
public class
PartyBuildingActivityVO {
public class PartyBuildingActivityVO {
    @ApiModelProperty("党员活动id")
    private Long id;

@@ -103,8 +103,5 @@

    @ApiModelProperty("是否是个人发起 1 是 0 否")
    private Integer isPerson;




}