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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborFabulousAppDTO.java

@@ -19,13 +19,13 @@
    @ApiModelProperty("邻里圈点赞业务id")
    private Long serviceId;

    @ApiModelProperty(value = "用户id",hidden = true)
    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;

    /**
     * 邻里圈点赞类型（1.邻里圈 2.评论 3.回复）
     */
    public interface type{
    public interface type {
        int llq = 1;
        int pl = 2;
        int hf = 3;