Merge remote-tracking branch 'origin/zcc'

src/main/java/com/peanut/modules/common/dao/UserContributionExchangeDao.java

@@ -0,0 +1,9 @@
+package com.peanut.modules.common.dao;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.peanut.modules.common.entity.UserContributionExchange;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserContributionExchangeDao extends MPJBaseMapper<UserContributionExchange> {
+}

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

@@ -23,6 +23,8 @@ public class CourseMedicine {
 
     private Integer sort;
 
+    private String icon;
+
     private Date createTime;
 
     @TableLogic

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

@@ -19,6 +19,12 @@ public class CourseToMedicine {
 
     private Integer sort;
 
+    //0隐藏1初级2高级
+    private Integer level;
+
+    //0隐藏1必修2选修
+    private Integer selective;
+
     private Date createTime;
 
     @TableLogic

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

@@ -0,0 +1,30 @@
+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_exchange")
+public class UserContributionExchange {
+
+    @TableId
+    private Integer id;
+
+    private Integer userId;
+
+    //剩余未换分数
+    private Double surplus;
+
+    private Date createTime;
+
+    @TableLogic
+    private Integer delFlag;
+
+    @TableField(exist = false)
+    private MyUserEntity user;
+
+}