Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

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

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

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

@@ -1,5 +1,6 @@
 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;
@@ -18,8 +19,17 @@ public class CourseToMedicineMarketEntity {
 
     private Integer medicineMarketId;
 
+    private Integer sort;
+
     private Date createTime;
 
     @TableLogic
     private Integer delFlag;
+
+    @TableField(exist = false)
+    private CourseMedicineMarketEntity courseMedicineMarketEntity;
+
+    @TableField(exist = false)
+    private CourseEntity courseEntity;
+
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -18,8 +19,17 @@ public class CourseToSociologyMarketEntity {
 
     private Integer sociologyMarketId;
 
+    private Integer sort;
+
     private Date createTime;
 
     @TableLogic
     private Integer delFlag;
+
+    @TableField(exist = false)
+    private CourseSociologyMarketEntity courseSociologyMarketEntity;
+
+    @TableField(exist = false)
+    private CourseEntity courseEntity;
+
 }

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

@@ -0,0 +1,28 @@
+package com.peanut.modules.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("sys_course_direct")
+public class SysCourseDirectEntity {
+
+    @TableId
+    private Integer id;
+
+    private Integer type;
+
+    private String buyRecord;
+
+    private String useRecord;
+
+    private String studyRecord;
+
+    private String vipRecord;
+
+    @TableLogic
+    private Integer delFlag;
+
+}

src/main/java/com/peanut/modules/common/to/EditCourseRecordDto.java

@@ -0,0 +1,10 @@
+package com.peanut.modules.common.to;
+
+import lombok.Data;
+
+@Data
+public class EditCourseRecordDto {
+    private Integer type;
+    private Integer recordType;
+    private String content;
+}