Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-23 2bfc3112c8ae43a9b00472f252572ca3e813cc82

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java

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

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;

/**
 * @auther lyq
@@ -48,6 +49,6 @@
     * 是否已经点赞 1 是 2 否
     */
    @ApiModelProperty("是否已经点赞 1 是 2 否")
    private Integer haveSign;
    private Integer haveSign = 2;

}