Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-09-07 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af

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

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

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
@@ -54,7 +55,6 @@
    @ApiModelProperty("回复人昵称")
    private String userNickNameBack;


    @ApiModelProperty("评论人手机号")
    private String phone;

@@ -65,7 +65,7 @@
    private Integer num;

    @ApiModelProperty("是否点赞 1 是 0 否")
    private Integer haveSign;
    private Integer haveSign = 0;

    @ApiModelProperty("回复内容")
    private String commentBack;