Merge branch 'master' into 'test'

罗元桥

2021-07-31 3d88bf929fc637a898ea0ca3e64cd6c1ec26a182

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java

@@ -13,7 +13,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 +31,7 @@
    /**
     * 用户主键
     */
    private Long user;
    private Long userId;

    /**
     * 点赞时间