Merge remote-tracking branch 'origin/zcc'

src/main/java/com/peanut/modules/common/entity/UserContribution.java

@@ -0,0 +1,38 @@
+package com.peanut.modules.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+@TableName("user_contribution")
+public class UserContribution {
+
+    @TableId
+    private Integer id;
+
+    private Integer userId;
+
+    //分数
+    private Double score;
+
+    //明细
+    private String detail;
+
+    //类型 在线教学 01 学术期刊 03 太湖讲堂 05 创作技术 07 注册邀请 11 课程邀请 13
+    private String type;
+
+    //兑换标志 未兑换0 兑换完毕1
+    private Integer conversionFlag;
+
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+
+    @TableField(exist = false)
+    private MyUserEntity user;
+}