From 11f6d2627ce8eb37c6460892509460b0e19e5656 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 二月 2024 17:00:06 +0800
Subject: [PATCH] Merge branch '1.0-bug' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/BenefitsVideos.java |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/BenefitsVideos.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/BenefitsVideos.java
index b603c57..f53e2cc 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/BenefitsVideos.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/BenefitsVideos.java
@@ -1,9 +1,11 @@
 package com.dsh.activity.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -35,36 +37,29 @@
     /**
      * 分类id
      */
+    @TableField("benefitsVideoClassificationId")
     private Integer benefitsVideoClassificationId;
     /**
-     * 视频名称
+     * 课程id
      */
-    private String name;
-    /**
-     * 视频封面
-     */
-    private String cover;
-    /**
-     * 视频简介
-     */
-    private String introduction;
-    /**
-     * 视频地址
-     */
-    private String videos;
+    @TableField("courseId")
+    private Integer courseId;
     /**
      * 可得积分
      */
-    private String integral;
+    @TableField("integral")
+    private Integer integral;
     /**
      * 状态(1=正常,2=冻结,3=删除)
      */
+    @TableField("state")
     private Integer state;
     /**
      * 添加时间
      */
+    @TableField("insertTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date insertTime;
-
 
     @Override
     protected Serializable pkVal() {

--
Gitblit v1.7.1