Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-27 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f

 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,14 +14,14 @@
 * @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;

    /**
     * 主键
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
@@ -31,7 +32,7 @@
    /**
     * 用户主键
     */
    private Long user;
    private Long userId;

    /**
     * 点赞时间