From 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 29 四月 2021 16:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java
index 6fbc3e6..9903cb4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java
@@ -1,8 +1,6 @@
 package com.panzhihua.service_community.model.dos;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -33,6 +31,11 @@
     private Integer type;
 
     /**
+     * 邻里圈id
+     */
+    private Long circleId;
+
+    /**
      * 点赞上级id
      */
     private Long parentId;
@@ -50,13 +53,32 @@
     /**
      * 点赞时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createAt;
 
     /**
      * 修改时间
      */
+    @TableField(fill = FieldFill.UPDATE)
     private Date updateAt;
 
+    /**
+     * 有效状态(1.有效  2.取消)
+     */
+    public interface isEffective{
+        int yes = 1;
+        int no = 2;
+    }
+
+    /**
+     * 点赞类型(1.邻里圈 2.评论 3.回复)
+     */
+    public interface type{
+        int llq = 1;
+        int pl = 2;
+        int hf = 3;
+    }
+
     @Override
     public String toString() {
         return "ComActNeighborCircleFabulousDO{" +

--
Gitblit v1.7.1