Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录

common/common-entity/sql记录

@@ -506,6 +506,8 @@ CREATE TABLE `base_course` (
  `doctor` varchar(50) DEFAULT NULL COMMENT '教师id',
  `doctor_name` varchar(50) DEFAULT NULL COMMENT '教师名称',
  `live_time` datetime DEFAULT NULL COMMENT '直播时间',
  `live_status` varchar(1) DEFAULT NULL COMMENT '直播状态',
  `live_duration` varchar(10) DEFAULT NULL COMMENT '直播时长',
  `course_cover` varchar(300) DEFAULT NULL COMMENT '课程封面',
  `status` varchar(1) DEFAULT NULL COMMENT '上架状态',
  `fee` decimal(10,2) DEFAULT NULL COMMENT '费用',
@@ -579,6 +581,7 @@ DROP TABLE IF EXISTS `base_recruit_students_record`;
CREATE TABLE `base_recruit_students_record` (
  `id` varchar(50) NOT NULL,
  `recruit_students_id` varchar(50) DEFAULT NULL COMMENT '招生id',
  `recruit_name` varchar(100) DEFAULT NULL COMMENT '招生名称',
  `patient` varchar(50) DEFAULT NULL,
  `patient_name` varchar(50) DEFAULT NULL COMMENT '姓名',
  `sex` varchar(1) DEFAULT NULL COMMENT '性别',

common/common-entity/src/main/java/com/yihu/jw/entity/care/course/CourseDO.java

@@ -54,6 +54,11 @@ public class CourseDO extends UuidIdentityEntityWithOperator {
     */
    private String liveStatus;
    private String liveStatusName;
    /**
     * 直播时长
     */
    private String liveDuration;
    /**
     * 上架状态
     */
@@ -222,4 +227,13 @@ public class CourseDO extends UuidIdentityEntityWithOperator {
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
    @Column(name = "live_duration")
    public String getLiveDuration() {
        return liveDuration;
    }
    public void setLiveDuration(String liveDuration) {
        this.liveDuration = liveDuration;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/care/course/RecruitStudentsRecordDO.java

@@ -22,6 +22,11 @@ public class RecruitStudentsRecordDO  extends UuidIdentityEntityWithTime {
     * '招生id'
     */
    private String recruitStudentsId;
    /**
     * 招生名称
     */
    private String recruitName;
    /**
     *
     */
@@ -141,4 +146,13 @@ public class RecruitStudentsRecordDO  extends UuidIdentityEntityWithTime {
    public void setDel(Integer del) {
        this.del = del;
    }
    @Column(name = "recruit_name")
    public String getRecruitName() {
        return recruitName;
    }
    public void setRecruitName(String recruitName) {
        this.recruitName = recruitName;
    }
}