From 9576bebcacea938771f6f5b51d958e6a4ac59df6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 09 十二月 2021 16:59:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java
index 1603f31..46e21ec 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java
@@ -1,10 +1,11 @@
 package com.panzhihua.service_community.model.dos;
 
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -13,7 +14,7 @@
  * @create: 2021-01-22 14:57
  **/
 @Data
-@TableName(value = "com_act_discuss")
+@TableName(value = "com_act_discuss_user")
 public class ComActDiscussUserDO implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -31,7 +32,7 @@
     /**
      * 用户主键
      */
-    private Long user;
+    private Long userId;
 
     /**
      * 点赞时间

--
Gitblit v1.7.1