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/PartyBuildingComPbDynVO.java

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

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
@@ -68,7 +69,6 @@

    @ApiModelProperty("动态内容富文本--纯文本")
    private String contentText;


    @ApiModelProperty(value = "是否增加 1 增加 0 不增加")
    private Integer isAdd;