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

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

@@ -9,8 +9,8 @@ import java.util.Date;
 import java.util.List;
 
 @Data
-@TableName("course_medical")
-public class CourseMedical {
+@TableName("course_medicine")
+public class CourseMedicine {
 
     @TableId
     private Integer id;
@@ -29,5 +29,5 @@ public class CourseMedical {
     private Integer delFlag;
 
     @TableField(exist = false)
-    private List<CourseMedical> children;
+    private List<CourseMedicine> children;
 }

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

@@ -10,8 +10,8 @@ import java.util.Date;
 import java.util.List;
 
 @Data
-@TableName("course_market")
-public class CourseMarketEntity {
+@TableName("course_medicine_market")
+public class CourseMedicineMarketEntity {
     @TableId
     private Integer id;
 
@@ -29,5 +29,5 @@ public class CourseMarketEntity {
     private Integer delFlag;
 
     @TableField(exist = false)
-    private List<CourseMarketEntity> children;
+    private List<CourseMedicineMarketEntity> children;
 }

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

@@ -1,31 +1,33 @@
 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;
+import java.util.List;
 
 @Data
-@TableName("course_category")
-public class CourseCategoryEntity {
-
+@TableName("course_sociology_market")
+public class CourseSociologyMarketEntity {
     @TableId
     private Integer id;
 
     private Integer pid;
 
-    private String uid;
+    private Integer isLast;
 
     private String title;
 
-    private Integer isLast;
-
     private Integer sort;
 
     private Date createTime;
 
     @TableLogic
     private Integer delFlag;
+
+    @TableField(exist = false)
+    private List<CourseSociologyMarketEntity> children;
 }

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

@@ -8,8 +8,8 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@TableName("course_to_medical")
-public class CourseToMedical {
+@TableName("course_to_medicine")
+public class CourseToMedicine {
     @TableId
     private Integer id;
 

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

@@ -8,15 +8,15 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@TableName("course_to_market")
-public class CourseToMarketEntity {
+@TableName("course_to_medicine_market")
+public class CourseToMedicineMarketEntity {
 
     @TableId
     private Integer id;
 
     private Integer courseId;
 
-    private Integer marketId;
+    private Integer medicineMarketId;
 
     private Date createTime;
 

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

@@ -8,14 +8,15 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@TableName("course_to_category")
-public class CourseToCategoryEntity {
+@TableName("course_to_sociology_market")
+public class CourseToSociologyMarketEntity {
+
     @TableId
     private Integer id;
 
     private Integer courseId;
 
-    private Integer categoryId;
+    private Integer sociologyMarketId;
 
     private Date createTime;