Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -10,7 +10,7 @@ import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.config.FeignConfiguration;
 
-@FeignClient(name = "auth-server", configuration = FeignConfiguration.class, fallback = SysUserFeignServiceFallback.class)
+@FeignClient(name = "auth-server", configuration = { FeignConfiguration.class }, fallback = SysUserFeignServiceFallback.class)
 public interface SysUserFeignService {
 
 	@GetMapping(value = "query/{username}")

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/filter/PhoneLoginAuthenticationFilter.java

@@ -18,6 +18,7 @@ import org.springframework.security.web.authentication.AbstractAuthenticationPro
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 import com.ym.mec.auth.api.dto.SysUserInfo;
+import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.config.constant.SecurityConstants;
 import com.ym.mec.auth.config.token.PhoneAuthenticationToken;
 import com.ym.mec.auth.service.SysUserService;
@@ -59,8 +60,8 @@ public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProces
 			throw new UsernameNotFoundException("用户名或密码错误");
 		}
 	
-		if (!StringUtils.equalsIgnoreCase(clientId, userInfo.getSysUser().getUserType().getCode())) {
-			throw new LockedException("用户名或密码错误");
+		if (userInfo.getSysUser().getUserType() != SysUserType.SYSTEM && !StringUtils.equalsIgnoreCase(clientId, userInfo.getSysUser().getUserType().getCode())) {
+			throw new LockedException("登录失败");
 		}
 
 		principal = principal.trim();

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/filter/UsernameAuthenticationFilter.java

@@ -19,6 +19,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.util.Assert;
 
 import com.ym.mec.auth.api.dto.SysUserInfo;
+import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.config.constant.SecurityConstants;
 import com.ym.mec.auth.service.SysUserService;
 
@@ -70,8 +71,8 @@ public class UsernameAuthenticationFilter extends AbstractAuthenticationProcessi
 			throw new UsernameNotFoundException("用户名或密码错误");
 		}
 	
-		if (!StringUtils.equalsIgnoreCase(clientId, userInfo.getSysUser().getUserType().getCode())) {
-			throw new LockedException("用户名或密码错误");
+		if (userInfo.getSysUser().getUserType() != SysUserType.SYSTEM && !StringUtils.equalsIgnoreCase(clientId, userInfo.getSysUser().getUserType().getCode())) {
+			throw new LockedException("登录失败");
 		}
 
 		UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(SecurityConstants.USERNAME_PRINCIPAL_PREFIX + username,

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -1,11 +1,13 @@
 package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
+import com.ym.mec.biz.dal.dto.CourseListDto;
 import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
 import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.common.dal.BaseDAO;
 
+import com.ym.mec.common.entity.ImGroupModel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -90,5 +92,19 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param musicGroupId
      * @return
      */
-    List<ClassGroupTeachers> findClassGroupByMusicGroupId(@Param("musicGroupId") int musicGroupId);
+    List<ClassGroupTeachers> findClassGroupByMusicGroupId(@Param("musicGroupId") Integer musicGroupId);
+
+    /**
+     * 获取学生所购买课程列表
+     * @param userId
+     * @return
+     */
+    List<CourseListDto> queryCoursePage(Integer userId);
+
+    /**
+     * 获取学员所在群组信息
+     * @param userId
+     * @return
+     */
+    List<ImGroupModel> queryUserGroups(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupTeacherMapperDao.java

@@ -26,5 +26,5 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @param ClassGroupList
      * @return
      */
-    List<ClassGroupTeacherMapper> findClassGroupTeachers(@Param("classGroupList") List<ClassGroup> ClassGroupList);
+    List<ClassGroupTeacherMapper> findClassGroupTeachers(@Param("classGroupList") List ClassGroupList);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupTeacherSalaryDao.java

@@ -3,7 +3,16 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
-public interface ClassGroupTeacherSalaryDao extends BaseDAO<Integer, ClassGroupTeacherSalary> {
+import java.util.List;
 
+public interface ClassGroupTeacherSalaryDao extends BaseDAO<Long, ClassGroupTeacherSalary> {
+
+    /**
+     * 获取乐团老师课酬配置
+     * @param musicGroupId
+     * @return
+     */
+    List<ClassGroupTeacherSalary> findByMusicGroupId(@Param("musicGroupId") int musicGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -14,6 +14,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
 
     /**
      * 根据教师ID获取当前课程信息
+     *
      * @param teacherID
      * @return
      */
@@ -87,4 +88,12 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * 根据id批量获取课程
      */
     List<CourseSchedule> findCourseSchedulesByIds(@Param("ids") Long[] ids);
+
+    /**
+     * 获取班级的课程计划
+     *
+     * @param classGroupList
+     * @return
+     */
+    List<CourseSchedule> findClassGroupCourseSchedules(@Param("classGroupList") List classGroupList);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
@@ -38,4 +40,11 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     Integer countCourseByType(@Param("userId") Integer userId, @Param("type") ClassGroupTypeEnum type);
+
+    /**
+     * 根绝学员编号获取相关老师列表
+     * @param studentId
+     * @return
+     */
+    List<BasicUserDto> findTeachersByStuId(Integer studentId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/BasicUserDto.java

@@ -0,0 +1,44 @@
+package com.ym.mec.biz.dal.dto;
+
+public class BasicUserDto {
+
+    private Integer userId;
+
+    private String name;
+
+    private String headUrl;
+
+    private Integer gender;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getHeadUrl() {
+        return headUrl;
+    }
+
+    public void setHeadUrl(String headUrl) {
+        this.headUrl = headUrl;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ClassGroupTeachers.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
 
 import java.util.List;
 
@@ -13,6 +14,9 @@ public class ClassGroupTeachers extends ClassGroup {
 	/** 班级老师 **/
 	private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;
 
+	/** 班级老师课酬 */
+	private List<ClassGroupTeacherSalary> classGroupTeacherSalaryList;
+
 
 	public List<ClassGroupTeacherMapper> getClassGroupTeacherMapperList() {
 		return classGroupTeacherMapperList;
@@ -21,4 +25,12 @@ public class ClassGroupTeachers extends ClassGroup {
 	public void setClassGroupTeacherMapperList(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
 		this.classGroupTeacherMapperList = classGroupTeacherMapperList;
 	}
+
+	public List<ClassGroupTeacherSalary> getClassGroupTeacherSalaryList() {
+		return classGroupTeacherSalaryList;
+	}
+
+	public void setClassGroupTeacherSalaryList(List<ClassGroupTeacherSalary> classGroupTeacherSalaryList) {
+		this.classGroupTeacherSalaryList = classGroupTeacherSalaryList;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicCardDto.java

@@ -8,6 +8,9 @@ public class MusicCardDto {
     @ApiModelProperty(value = "用户姓名",required = true)
     private String userName;
 
+    @ApiModelProperty(value = "乐团编号",required = true)
+    private String musicGroupId;
+
     @ApiModelProperty(value = "乐团名称",required = true)
     private String musicGroupName;
 
@@ -29,6 +32,14 @@ public class MusicCardDto {
     @ApiModelProperty(value = "vip课数量",required = true)
     private Integer vipClassNum;
 
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
     public Integer getMusicGroupNum() {
         return musicGroupNum;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupTeacherSalary.java

@@ -1,76 +1,11 @@
 package com.ym.mec.biz.dal.entity;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class ClassGroupTeacherSalary {
-    private Long id;
-
-    private Integer musicGroupId;
-
-    private Integer classGroupId;
-
+public class ClassGroupTeacherSalary extends ClassGroupTeacherMapper {
     /**
-    * 老师角色（主教、助教）
-    */
-    private String teacherRole;
-
-    private Integer userId;
-
-    /**
-    * 课时长
-    */
+     * 课时长
+     */
     private Integer duration;
 
-    /**
-    * 薪酬
-    */
-    private BigDecimal salary;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Integer getMusicGroupId() {
-        return musicGroupId;
-    }
-
-    public void setMusicGroupId(Integer musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
-
-    public Integer getClassGroupId() {
-        return classGroupId;
-    }
-
-    public void setClassGroupId(Integer classGroupId) {
-        this.classGroupId = classGroupId;
-    }
-
-    public String getTeacherRole() {
-        return teacherRole;
-    }
-
-    public void setTeacherRole(String teacherRole) {
-        this.teacherRole = teacherRole;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
     public Integer getDuration() {
         return duration;
     }
@@ -78,28 +13,4 @@ public class ClassGroupTeacherSalary {
     public void setDuration(Integer duration) {
         this.duration = duration;
     }
-
-    public BigDecimal getSalary() {
-        return salary;
-    }
-
-    public void setSalary(BigDecimal salary) {
-        this.salary = salary;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Organization.java

@@ -20,6 +20,10 @@ public class Organization {
 	/** 机构名称 */
 	@ApiModelProperty(value = "机构名称",required = false)
 	private String name;
+
+	/** 机构名称 */
+	@ApiModelProperty(value = "区域名称",required = false)
+	private String areaName;
 	
 	/** 区域编码 */
 	@ApiModelProperty(value = "区域编码",required = false)
@@ -50,6 +54,14 @@ public class Organization {
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Organization> organizations;
 
+	public String getAreaName() {
+		return areaName;
+	}
+
+	public void setAreaName(String areaName) {
+		this.areaName = areaName;
+	}
+
 	public List<Organization> getOrganizations() {
 		return organizations;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -2,12 +2,11 @@ package com.ym.mec.biz.service;
 
 import java.util.List;
 
-import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
-import com.ym.mec.biz.dal.dto.HighClassGroup;
-import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
+import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 import org.apache.ibatis.annotations.Param;
@@ -75,6 +74,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
     /**
      * 提高班批量添加
+     *
      * @param highClassGroupList
      * @return
      * @throws Exception
@@ -83,6 +83,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
     /**
      * 获取老师乐团课程信息列表
+     *
      * @param teacherId
      * @return
      */
@@ -90,6 +91,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
     /**
      * 获取老师VIP课程信息列表
+     *
      * @param queryInfo
      * @return
      */
@@ -98,9 +100,33 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
     /**
      * 获取乐团班级老师课酬
+     *
      * @param musicGroupId
      * @return
      */
     List<ClassGroupTeachers> getClassGroupAndTeachers(Integer musicGroupId);
 
+    /**
+     * 获取乐团班级老师课酬
+     *
+     * @param musicGroupId
+     * @return
+     */
+    List<ClassGroupTeachers> getClassGroupAndTeacherSalary(Integer musicGroupId);
+
+
+    /**
+     * 获取学生所购买课程列表
+     *
+     * @param userId
+     * @return
+     */
+    List<CourseListDto> queryCoursePage(Integer userId);
+
+    /**
+     * 获取学员所在群组信息
+     * @param userId
+     * @return
+     */
+    List<ImGroupModel> queryUserGroups(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupTeacherMapperService.java

@@ -25,7 +25,7 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
      * @param classGroupList
      * @return
      */
-    List<ClassGroupTeacherMapper> findClassGroupTeachers(List<ClassGroup> classGroupList);
+    List<ClassGroupTeacherMapper> findClassGroupTeachers(List classGroupList);
 
     /**
      * 批量更新教师薪酬

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupTeacherSalaryService.java

@@ -0,0 +1,19 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
+import com.ym.mec.common.service.BaseService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ClassGroupTeacherSalaryService extends BaseService<Long, ClassGroupTeacherSalary> {
+    /**
+     * 获取乐团老师课酬配置
+     *
+     * @param musicGroupId
+     * @return
+     */
+    List<ClassGroupTeacherSalary> findByMusicGroupId(int musicGroupId);
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dto.CourseScheduleDto;
 import com.ym.mec.biz.dal.dto.TeacherAttendanceDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.common.service.BaseService;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
@@ -59,4 +60,12 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
      * 课程交换
      */
     void courseSwap(Long courseScheduleId1,Long courseScheduleId2);
+
+    /**
+     * 获取班级的课程计划
+     *
+     * @param classGroupList
+     * @return
+     */
+    List<CourseSchedule> findClassGroupCourseSchedules(List classGroupList);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
@@ -18,6 +20,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
     /**
      * 建团申请数据提交
      * @param subFeeSettingDto
+     * @Author superzou
      */
     void createGroup(SubFeeSettingDto subFeeSettingDto);
 
@@ -33,4 +36,11 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
      * @return
      */
     MusicCardDto queryPersonalMusicGroups(Integer id);
+
+    /**
+     * 根据学员编号获取相关老师列表
+     * @param studentId
+     * @return
+     */
+    List<BasicUserDto> findTeachersByStuId(Integer studentId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -2,27 +2,24 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
-import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
-import com.ym.mec.biz.dal.dto.HighClassGroup;
-import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
-import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 
+import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.math.BigDecimal;
+import java.time.*;
 import java.util.*;
 
 @Service
@@ -44,6 +41,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     private CourseScheduleService courseScheduleService;
     @Autowired
     private StudentRegistrationService studentRegistrationService;
+    @Autowired
+    private ClassGroupTeacherSalaryService classGroupTeacherSalaryService;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -249,9 +248,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     public List<ClassGroupTeachers> getClassGroupAndTeachers(Integer musicGroupId) {
         List<ClassGroupTeachers> classGroupAndTeachersList = classGroupDao.findClassGroupByMusicGroupId(musicGroupId);
-        List<ClassGroup> classGroupList = Collections.unmodifiableList(classGroupAndTeachersList);
 
-        List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.findClassGroupTeachers(classGroupList);
+        List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.findClassGroupTeachers(classGroupAndTeachersList);
 
         for (ClassGroupTeachers classGroupAndTeachers : classGroupAndTeachersList) {
             List<ClassGroupTeacherMapper> oneClassGroupTeacherMapperList = new ArrayList<>();
@@ -264,4 +262,72 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         return classGroupAndTeachersList;
     }
+
+    @Override
+    public List<ClassGroupTeachers> getClassGroupAndTeacherSalary(Integer musicGroupId) {
+        //乐团班级及班级老师
+        List<ClassGroupTeachers> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId);
+        //乐团的课程计划
+        List<CourseSchedule> classGroupCourseSchedules = courseScheduleService.findClassGroupCourseSchedules(classGroupAndTeachers);
+
+        //获取乐团老师课酬
+        List<ClassGroupTeacherSalary> nowClassGroupTeacherSalaryList = classGroupTeacherSalaryService.findByMusicGroupId(musicGroupId);
+
+        //基础课时
+        BigDecimal baseDuration = new BigDecimal("30");
+        for (ClassGroupTeachers classGroupAndTeacher : classGroupAndTeachers) {
+
+            Set<Long> courseScheduleDurationSet = new HashSet<>();
+            for (CourseSchedule classGroupCourseSchedule : classGroupCourseSchedules) {
+                if (classGroupCourseSchedule.getClassGroupId().equals(classGroupAndTeacher.getId())) {
+                    //课程时长
+                    long duration = (classGroupCourseSchedule.getEndClassTime().getTime() - classGroupCourseSchedule.getStartClassTime().getTime()) / (1000 * 60);
+                    courseScheduleDurationSet.add(duration);
+                }
+            }
+
+            //获取教师列表
+            List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupAndTeacher.getClassGroupTeacherMapperList();
+
+            ArrayList<ClassGroupTeacherSalary> classGroupTeacherSalaryList = new ArrayList<>();
+            for (Long duration : courseScheduleDurationSet) {
+                THREE:
+                for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
+
+                    //已经设置跳过计算
+                    for (ClassGroupTeacherSalary classGroupTeacherSalary : nowClassGroupTeacherSalaryList) {
+                        if (classGroupTeacherMapper.getClassGroupId().equals(classGroupTeacherSalary.getClassGroupId()) &&
+                                classGroupTeacherMapper.getUserId().equals(classGroupTeacherSalary.getUserId()) &&
+                                classGroupTeacherSalary.getDuration().equals(duration)
+                        ) {
+                            classGroupTeacherSalaryList.add(classGroupTeacherSalary);
+                            continue THREE;
+                        }
+                    }
+
+                    ClassGroupTeacherSalary classGroupTeacherSalary = new ClassGroupTeacherSalary();
+                    classGroupTeacherSalary.setMusicGroupId(classGroupTeacherMapper.getMusicGroupId());
+                    classGroupTeacherSalary.setClassGroupId(classGroupTeacherMapper.getClassGroupId());
+                    classGroupTeacherSalary.setTeacherRole(classGroupTeacherMapper.getTeacherRole());
+                    classGroupTeacherSalary.setUserId(classGroupTeacherMapper.getUserId());
+                    classGroupTeacherSalary.setDuration(duration.intValue());
+                    BigDecimal salary = new BigDecimal(duration).divide(baseDuration).multiply(classGroupTeacherMapper.getSalary()).setScale(2, BigDecimal.ROUND_HALF_UP);
+                    classGroupTeacherSalary.setSalary(salary);
+                    classGroupTeacherSalaryList.add(classGroupTeacherSalary);
+                }
+            }
+            //教师课酬列表
+            classGroupAndTeacher.setClassGroupTeacherSalaryList(classGroupTeacherSalaryList);
+        }
+        return classGroupAndTeachers;
+    }
+
+    public List<CourseListDto> queryCoursePage(Integer userId) {
+        return classGroupDao.queryCoursePage(userId);
+    }
+
+    @Override
+    public List<ImGroupModel> queryUserGroups(Integer userId) {
+        return classGroupDao.queryUserGroups(userId);
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupTeacherMapperServiceImpl.java

@@ -31,7 +31,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
 
     @Override
-    public List<ClassGroupTeacherMapper> findClassGroupTeachers(List<ClassGroup> ClassGroupList) {
+    public List<ClassGroupTeacherMapper> findClassGroupTeachers(List ClassGroupList) {
         return classGroupTeacherMapperDao.findClassGroupTeachers(ClassGroupList);
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupTeacherSalaryServiceImpl.java

@@ -0,0 +1,29 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.ClassGroupTeacherSalaryDao;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
+import com.ym.mec.biz.service.ClassGroupTeacherSalaryService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ClassGroupTeacherSalaryServiceImpl extends BaseServiceImpl<Long, ClassGroupTeacherSalary> implements ClassGroupTeacherSalaryService {
+
+    @Autowired
+    private ClassGroupTeacherSalaryDao ClassGroupTeacherSalaryDao;
+
+    @Override
+    public BaseDAO<Long, ClassGroupTeacherSalary> getDAO() {
+        return ClassGroupTeacherSalaryDao;
+    }
+
+
+    @Override
+    public List<ClassGroupTeacherSalary> findByMusicGroupId(int musicGroupId) {
+        return ClassGroupTeacherSalaryDao.findByMusicGroupId(musicGroupId);
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -203,7 +203,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		courseScheduleDao.update(courseSchedules.get(1));
 	}
 
-	/**
+    @Override
+    public List<CourseSchedule> findClassGroupCourseSchedules(List classGroupList) {
+		return courseScheduleDao.findClassGroupCourseSchedules(classGroupList);
+    }
+
+    /**
 	 * @Author: Joburgess
 	 * @Date: 2019/9/24
 	 * 检测学生是否存在重复

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.entity.*;
@@ -101,4 +103,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup>
 		musicCardDto.setVipClassNum(musicGroupDao.countCourseByType(id,ClassGroupTypeEnum.VIP));
 		return musicGroupDao.queryPersonalMusicGroups(id);
 	}
+
+	@Override
+	public List<BasicUserDto> findTeachersByStuId(Integer studentId) {
+		return musicGroupDao.findTeachersByStuId(studentId);
+	}
 }

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -255,4 +255,46 @@
     <select id="findClassGroupByMusicGroupId" resultMap="ClassGroupTeachers">
         SELECT * FROM class_group WHERE music_group_id_ = #{musicGroupId} AND del_flag_ = 0;
     </select>
+
+    <resultMap type="com.ym.mec.biz.dal.dto.CourseListDto" id="CourseListDto">
+        <result column="id_" property="musicGroupName"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="subject_id_list_" property="teachMode"/>
+        <result column="name_" property="totalClassTimes"/>
+        <result column="student_num_" property="currentClassTimes"/>
+        <result column="create_time_" property="studentNames"/>
+        <result column="update_time_" property="teacherName"/>
+        <result column="type_" property="address"/>
+    </resultMap>
+    <select id="queryCoursePage" resultMap="CourseListDto">
+        SELECT * FROM (
+            SELECT cg.type_,s.address_,mg.name_ music_group_name_,
+            cg.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_ music_group_id_,cg.create_time_
+            FROM student_registration sr
+            LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
+            LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
+            LEFT JOIN school s ON mg.school_id_ = s.id_
+            WHERE sr.user_id_ = #{userId} AND cg.type_ != 'VIP'
+            UNION ALL
+            SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
+            cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_ music_group_id_,cg.create_time_
+            FROM class_group_student_mapper cgsm
+            LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
+            LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
+            LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
+            LEFT JOIN teacher_school ts ON vg.teacher_school_id_ = ts.id_
+            WHERE cgsm.user_id_ = #{userId} AND cg.type_ = 'VIP') a
+            ORDER BY a.create_time_ DESC
+    </select>
+
+    <resultMap id="imGroupModel" type="com.ym.mec.common.entity.ImGroupModel">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="student_num_" property="minute"/>
+    </resultMap>
+    <select id="queryUserGroups" resultMap="imGroupModel">
+        SELECT cg.id_,cg.name_,cg.student_num_ FROM class_group_student_mapper cgsm
+        LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
+        WHERE cgsm.user_id_ = #{userId}
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/ClassGroupTeacherSalaryMapper.xml

@@ -12,11 +12,6 @@
     <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
-  <sql id="Base_Column_List">
-    
-    id_, music_group_id_, class_group_id_, teacher_role_, user_id_, duration_, salary_, 
-    create_time_, update_time_
-  </sql>
   <select id="get" parameterType="java.lang.Long" resultMap="ClassGroupTeacherSalary">
      select * from class_group_teacher_salary where id_ = #{id}
   </select>
@@ -121,4 +116,10 @@
   <select id="queryCount" resultType="int">
     SELECT COUNT(*) FROM class_group_teacher_salary
   </select>
+
+  <!-- 获取乐团老师课酬配置表 -->
+  <select id="findByMusicGroupId" resultMap="ClassGroupTeacherSalary">
+    SELECT * FROM class_group_teacher_salary WHERE music_group_id_ = #{musicGroupId}
+  </select>
+
 </mapper>

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -294,4 +294,13 @@
             #{id}
         </foreach>
     </select>
+
+    <!-- 获取班级的课程 -->
+    <select id="findClassGroupCourseSchedules" resultMap="CourseSchedule">
+        SELECT * FROM course_schedule
+        WHERE class_group_id_ IN
+        <foreach collection="classGroupList" item="classGroup" index="index" open="(" close=")" separator=",">
+            #{classGroup.id}
+        </foreach>
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -133,6 +133,7 @@
 		<result column="current_class_" property="currentClass" />
 		<result column="current_grade_" property="currentGrade" />
 		<result column="music_group_name_" property="musicGroupName" />
+		<result column="music_group_id_" property="musicGroupId" />
 		<result column="vip_class_num_" property="vipClassNum" />
 		<result column="music_group_num_" property="musicGroupNum" />
 		<result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -140,7 +141,7 @@
 
     <select id="queryUserMusicGroups" resultMap="queryUserMusicGroupsMap">
 		SELECT sr.name_ user_name_,sr.current_class_,sr.current_grade_,
-		sr.payment_status_,mg.name_ music_group_name_,s.name_ subject_name_
+		sr.payment_status_,mg.name_ music_group_name_,s.name_ subject_name_,mg.id_ music_group_id_
 		FROM student_registration sr
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
 		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
@@ -166,4 +167,19 @@
 		LEFT JOIN class_group cg ON sr.class_group_id_ = cg.id_
 		WHERE sr.user_id_ = #{userId} AND cg.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 	</select>
+
+	<resultMap type="com.ym.mec.biz.dal.dto.BasicUserDto" id="BasicUserDto">
+		<result column="username_" property="name" />
+		<result column="user_id_" property="userId" />
+		<result column="head_url_" property="headUrl" />
+		<result column="gender_" property="gender"/>
+	</resultMap>
+	<select id="findTeachersByStuId" resultMap="BasicUserDto">
+		SELECT username_,id_ user_id_,avatar_ head_url_,gender_ FROM sys_user
+		WHERE id_ IN (SELECT DISTINCT(su.id_) FROM class_group_student_mapper cgsp
+		LEFT JOIN class_group cg ON cgsp.class_group_id_ = cg.id_
+		LEFT JOIN class_group_teacher_mapper cgtm ON cg.id_ = cgtm.class_group_id_
+		LEFT JOIN sys_user su ON cgtm.user_id_ = su.id_
+		WHERE cgsp.user_id_ = #{studentId})
+	</select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -9,6 +9,7 @@
     <resultMap type="com.ym.mec.biz.dal.entity.Organization" id="Organization">
         <result column="id_" property="id"/>
         <result column="name_" property="name"/>
+        <result column="area_name_" property="areaName"/>
         <result column="area_id_" property="areaId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -76,14 +77,14 @@
     <sql id="queryPageSql">
         <where>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+                o.del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
         </where>
     </sql>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="Organization" parameterType="map">
-        SELECT * FROM organization
+        SELECT o.*,sa.name_ area_name_ FROM organization o LEFT JOIN sys_area sa ON o.area_id_ = sa.id_
         <include refid="queryPageSql"/>
          ORDER BY id_
         <include refid="global.limit"/>
@@ -91,12 +92,15 @@
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM organization <include refid="queryPageSql"/>
+		SELECT COUNT(o.id_) FROM organization o <include refid="queryPageSql"/>
 	</select>
 
     <select id="findByParentId" resultMap="Organization">
-        SELECT * FROM organization <include refid="queryPageSql"/>
+        SELECT o.*,sa.name_ area_name_ FROM organization o
+        LEFT JOIN sys_area sa ON o.area_id_ = sa.id_
+        <include refid="queryPageSql"/>
     </select>
+
     <select id="findByOrganIds" resultType="java.lang.String">
         SELECT name_ FROM organization IN (#{organIds}) WHERE del_flag_ = 0
     </select>

mec-client-api/src/main/java/com/ym/im/ImFeignService.java

@@ -1,12 +1,13 @@
 package com.ym.im;
 
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
 import com.ym.im.fallback.ImFeignServiceFallback;
 import com.ym.mec.common.config.FeignConfiguration;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(name = "im-server", configuration = FeignConfiguration.class, fallback = ImFeignServiceFallback.class)
 public interface ImFeignService {

mec-common/common-core/src/main/java/com/ym/mec/common/config/FeignConfiguration.java

@@ -1,35 +1,22 @@
 package com.ym.mec.common.config;
 
-import java.util.Enumeration;
-
-import javax.servlet.http.HttpServletRequest;
-
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
+import feign.Logger;
 import feign.RequestInterceptor;
-import feign.RequestTemplate;
 
 @Configuration
-public class FeignConfiguration implements RequestInterceptor {
-
-	@Override
-	public void apply(RequestTemplate template) {
-		ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-		if (attributes == null) {
-			return;
-		}
-		HttpServletRequest request = attributes.getRequest();
-		Enumeration<String> headerNames = request.getHeaderNames();
-		if (headerNames != null) {
-			while (headerNames.hasMoreElements()) {
-				String name = headerNames.nextElement();
-				String values = request.getHeader(name);
-				template.header(name, values);
+public class FeignConfiguration {
 
-			}
-		}
+	@Bean
+	Logger.Level feignLoggerLevel() {
+		// 这里记录所有，根据实际情况选择合适的日志level
+		return Logger.Level.FULL;
+	}
+	
+	@Bean
+	public RequestInterceptor requestInterceptor(){
+		return new RequestHeaderConfiguration();
 	}
-
 }

mec-common/common-core/src/main/java/com/ym/mec/common/config/RequestAttributeHystrixConcurrencyStrategy.java

@@ -0,0 +1,128 @@
+package com.ym.mec.common.config;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+
+import com.netflix.hystrix.HystrixThreadPoolKey;
+import com.netflix.hystrix.HystrixThreadPoolProperties;
+import com.netflix.hystrix.strategy.HystrixPlugins;
+import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
+import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariable;
+import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariableLifecycle;
+import com.netflix.hystrix.strategy.eventnotifier.HystrixEventNotifier;
+import com.netflix.hystrix.strategy.executionhook.HystrixCommandExecutionHook;
+import com.netflix.hystrix.strategy.metrics.HystrixMetricsPublisher;
+import com.netflix.hystrix.strategy.properties.HystrixPropertiesStrategy;
+import com.netflix.hystrix.strategy.properties.HystrixProperty;
+
+@Component
+public class RequestAttributeHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy {
+	private static final Logger log = LoggerFactory.getLogger(RequestAttributeHystrixConcurrencyStrategy.class);
+
+	private HystrixConcurrencyStrategy delegate;
+
+	public RequestAttributeHystrixConcurrencyStrategy() {
+		try {
+			this.delegate = HystrixPlugins.getInstance().getConcurrencyStrategy();
+			if (this.delegate instanceof RequestAttributeHystrixConcurrencyStrategy) {
+				// Welcome to singleton hell...
+				return;
+			}
+			HystrixCommandExecutionHook commandExecutionHook = HystrixPlugins
+					.getInstance().getCommandExecutionHook();
+			HystrixEventNotifier eventNotifier = HystrixPlugins.getInstance()
+					.getEventNotifier();
+			HystrixMetricsPublisher metricsPublisher = HystrixPlugins.getInstance()
+					.getMetricsPublisher();
+			HystrixPropertiesStrategy propertiesStrategy = HystrixPlugins.getInstance()
+					.getPropertiesStrategy();
+			this.logCurrentStateOfHystrixPlugins(eventNotifier, metricsPublisher,
+					propertiesStrategy);
+			HystrixPlugins.reset();
+			HystrixPlugins.getInstance().registerConcurrencyStrategy(this);
+			HystrixPlugins.getInstance()
+					.registerCommandExecutionHook(commandExecutionHook);
+			HystrixPlugins.getInstance().registerEventNotifier(eventNotifier);
+			HystrixPlugins.getInstance().registerMetricsPublisher(metricsPublisher);
+			HystrixPlugins.getInstance().registerPropertiesStrategy(propertiesStrategy);
+		}
+		catch (Exception e) {
+			log.error("Failed to register Sleuth Hystrix Concurrency Strategy", e);
+		}
+	}
+
+	private void logCurrentStateOfHystrixPlugins(HystrixEventNotifier eventNotifier,
+			HystrixMetricsPublisher metricsPublisher,
+			HystrixPropertiesStrategy propertiesStrategy) {
+		if (log.isDebugEnabled()) {
+			log.debug("Current Hystrix plugins configuration is ["
+					+ "concurrencyStrategy [" + this.delegate + "]," + "eventNotifier ["
+					+ eventNotifier + "]," + "metricPublisher [" + metricsPublisher + "],"
+					+ "propertiesStrategy [" + propertiesStrategy + "]," + "]");
+			log.debug("Registering Sleuth Hystrix Concurrency Strategy.");
+		}
+	}
+
+	@Override
+	public <T> Callable<T> wrapCallable(Callable<T> callable) {
+		RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+		return new WrappedCallable<>(callable, requestAttributes);
+	}
+
+	@Override
+	public ThreadPoolExecutor getThreadPool(HystrixThreadPoolKey threadPoolKey,
+			HystrixProperty<Integer> corePoolSize,
+			HystrixProperty<Integer> maximumPoolSize,
+			HystrixProperty<Integer> keepAliveTime, TimeUnit unit,
+			BlockingQueue<Runnable> workQueue) {
+		return this.delegate.getThreadPool(threadPoolKey, corePoolSize, maximumPoolSize,
+				keepAliveTime, unit, workQueue);
+	}
+
+	@Override
+	public ThreadPoolExecutor getThreadPool(HystrixThreadPoolKey threadPoolKey,
+			HystrixThreadPoolProperties threadPoolProperties) {
+		return this.delegate.getThreadPool(threadPoolKey, threadPoolProperties);
+	}
+
+	@Override
+	public BlockingQueue<Runnable> getBlockingQueue(int maxQueueSize) {
+		return this.delegate.getBlockingQueue(maxQueueSize);
+	}
+
+	@Override
+	public <T> HystrixRequestVariable<T> getRequestVariable(
+			HystrixRequestVariableLifecycle<T> rv) {
+		return this.delegate.getRequestVariable(rv);
+	}
+
+	static class WrappedCallable<T> implements Callable<T> {
+
+		private final Callable<T> target;
+		private final RequestAttributes requestAttributes;
+
+		public WrappedCallable(Callable<T> target, RequestAttributes requestAttributes) {
+			this.target = target;
+			this.requestAttributes = requestAttributes;
+		}
+
+		@Override
+		public T call() throws Exception {
+			try {
+				RequestContextHolder.setRequestAttributes(requestAttributes);
+				return target.call();
+			}
+			finally {
+				RequestContextHolder.resetRequestAttributes();
+			}
+		}
+	}
+}

mec-common/common-core/src/main/java/com/ym/mec/common/config/RequestHeaderConfiguration.java

@@ -0,0 +1,33 @@
+package com.ym.mec.common.config;
+
+import java.util.Enumeration;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+public class RequestHeaderConfiguration implements RequestInterceptor {
+
+	@Override
+	public void apply(RequestTemplate template) {
+		ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+		if (attributes == null) {
+			return;
+		}
+		HttpServletRequest request = attributes.getRequest();
+		Enumeration<String> headerNames = request.getHeaderNames();
+		if (headerNames != null) {
+			while (headerNames.hasMoreElements()) {
+				String name = headerNames.nextElement();
+				String values = request.getHeader(name);
+				template.header(name, values);
+
+			}
+		}
+	}
+
+}

mec-education/pom.xml

@@ -51,13 +51,6 @@
 			<artifactId>mybatis-plus-boot-starter</artifactId>
 			<version>3.1.0</version>
 		</dependency>
-
-		<dependency>
-			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-extension</artifactId>
-			<version>3.1.0</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -75,6 +68,29 @@
 			<artifactId>velocity-engine-core</artifactId>
 			<version>2.0</version>
 		</dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-test</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>5.1.9.RELEASE</version>
+			<scope>compile</scope>
+		</dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>javax.persistence-api</artifactId>
+		</dependency>
 
 	</dependencies>
 	<build>

mec-education/src/main/java/com/ym/mec/education/EducationApplication.java

@@ -1,6 +1,7 @@
 package com.ym.mec.education;
 
 import com.spring4all.swagger.EnableSwagger2Doc;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -9,6 +10,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestTemplate;
 
+@MapperScan("com.ym.mec.education.mapper*")
 @SpringBootApplication
 @EnableDiscoveryClient
 @Configuration

mec-education/src/main/java/com/ym/mec/education/base/BaseResponse.java

@@ -0,0 +1,31 @@
+package com.ym.mec.education.base;
+
+import javax.persistence.MappedSuperclass;
+import java.io.Serializable;
+
+/**
+ * @author : chengp
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 17:53
+ */
+@MappedSuperclass
+public class BaseResponse<T> extends Response implements Serializable {
+    protected T dataInfo;
+
+    public BaseResponse() {
+    }
+
+    public T getDataInfo() {
+        return this.dataInfo;
+    }
+
+    public void setDataInfo(final T dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+
+    @Override
+    public String toString() {
+        return "BaseResponse(super=" + super.toString() + ", dataInfo=" + this.getDataInfo() + ")";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/base/PageResponse.java

@@ -0,0 +1,168 @@
+package com.ym.mec.education.base;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 17:53
+ */
+public class PageResponse<T> extends Response implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private List<T> records;
+    private Integer total;
+    private Integer size;
+    private Integer pages;
+    private Integer current;
+    private boolean searchCount;
+    private boolean optimizeCount;
+    private String orderByField;
+    private boolean isAsc;
+
+    public PageResponse() {
+        this.records = Collections.emptyList();
+        this.size = 10;
+        this.current = 1;
+        this.searchCount = true;
+        this.optimizeCount = false;
+        this.isAsc = true;
+    }
+
+    public PageResponse(Integer current, Integer size) {
+        this(current, size, true);
+    }
+
+    public PageResponse(Integer current, Integer size, String orderByField) {
+        this.records = Collections.emptyList();
+        this.setOrderByField(orderByField);
+    }
+
+    public PageResponse(Integer current, Integer size, boolean searchCount) {
+        this.records = Collections.emptyList();
+        this.size = 10;
+        this.current = 1;
+        this.searchCount = true;
+        this.optimizeCount = false;
+        this.isAsc = true;
+        if (current > 1) {
+            this.current = current;
+        }
+
+        this.size = size;
+        this.searchCount = searchCount;
+    }
+
+    public List<T> getRecords() {
+        return this.records;
+    }
+
+    public void setRecords(List<T> records) {
+        this.records = records;
+    }
+
+    protected static Integer offsetCurrent(Integer current, Integer size) {
+        return current > 0 ? (current - 1) * size : 0;
+    }
+
+    public Integer getOffsetCurrent() {
+        return offsetCurrent(this.current, this.size);
+    }
+
+    public boolean hasPrevious() {
+        return this.current > 1;
+    }
+
+    public boolean hasNext() {
+        return this.current < this.pages;
+    }
+
+    public Integer getTotal() {
+        return this.total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public Integer getSize() {
+        return this.size;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+
+    public Integer getPages() {
+        if (this.size != null && 0 != this.size && this.total != null) {
+            this.pages = this.total / this.size;
+            if (this.total % this.size != 0) {
+                this.pages = this.pages + 1;
+            }
+
+            return this.pages;
+        } else {
+            return null;
+        }
+    }
+
+    public void setCurrent(Integer current) {
+        this.current = current;
+    }
+
+    public Integer getCurrent() {
+        return this.current;
+    }
+
+    public boolean isSearchCount() {
+        return this.searchCount;
+    }
+
+    public void setSearchCount(boolean searchCount) {
+        this.searchCount = searchCount;
+    }
+
+    public boolean isOptimizeCount() {
+        return this.optimizeCount;
+    }
+
+    public void setOptimizeCount(boolean optimizeCount) {
+        this.optimizeCount = optimizeCount;
+    }
+
+    public String getOrderByField() {
+        return this.orderByField;
+    }
+
+    public void setOrderByField(String orderByField) {
+        if (StringUtils.isNotEmpty(orderByField)) {
+            this.orderByField = orderByField;
+        }
+
+    }
+
+    public boolean isAsc() {
+        return this.isAsc;
+    }
+
+    public void setAsc(boolean isAsc) {
+        this.isAsc = isAsc;
+    }
+
+    @Override
+    public String toString() {
+        StringBuffer pg = new StringBuffer();
+        pg.append(" Page:{ [").append(super.toString()).append("], ");
+        if (this.records != null) {
+            pg.append("records-size:").append(this.records.size());
+        } else {
+            pg.append("records is null");
+        }
+
+        return pg.append(" }").toString();
+    }
+
+}

mec-education/src/main/java/com/ym/mec/education/base/Response.java

@@ -0,0 +1,100 @@
+package com.ym.mec.education.base;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 17:50
+ */
+import java.io.Serializable;
+
+public class Response implements Serializable {
+    protected Integer returnCode;
+    protected String message;
+    protected String chainId;
+
+    public Response() {
+    }
+
+    public Integer getReturnCode() {
+        return this.returnCode;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public String getChainId() {
+        return this.chainId;
+    }
+
+    public void setReturnCode(final Integer returnCode) {
+        this.returnCode = returnCode;
+    }
+
+    public void setMessage(final String message) {
+        this.message = message;
+    }
+
+    public void setChainId(final String chainId) {
+        this.chainId = chainId;
+    }
+    @Override
+    public boolean equals(final Object o) {
+        if (o == this) {
+            return true;
+        } else if (!(o instanceof Response)) {
+            return false;
+        } else {
+            Response other = (Response) o;
+            if (!other.canEqual(this)) {
+                return false;
+            } else {
+                label47:
+                {
+                    Object this$returnCode = this.getReturnCode();
+                    Object other$returnCode = other.getReturnCode();
+                    if (this$returnCode == null) {
+                        if (other$returnCode == null) {
+                            break label47;
+                        }
+                    } else if (this$returnCode.equals(other$returnCode)) {
+                        break label47;
+                    }
+
+                    return false;
+                }
+
+                Object this$message = this.getMessage();
+                Object other$message = other.getMessage();
+                if (this$message == null) {
+                    if (other$message != null) {
+                        return false;
+                    }
+                } else if (!this$message.equals(other$message)) {
+                    return false;
+                }
+
+                Object this$chainId = this.getChainId();
+                Object other$chainId = other.getChainId();
+                if (this$chainId == null) {
+                    if (other$chainId != null) {
+                        return false;
+                    }
+                } else if (!this$chainId.equals(other$chainId)) {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+    }
+
+    protected boolean canEqual(final Object other) {
+        return other instanceof Response;
+    }
+
+    @Override
+    public String toString() {
+        return "Response(returnCode=" + this.getReturnCode() + ", message=" + this.getMessage() + ", chainId=" + this.getChainId() + ")";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/controller/MusicGroupController.java

@@ -0,0 +1,38 @@
+package com.ym.mec.education.controller;
+
+import com.netflix.hystrix.contrib.javanica.annotation.DefaultProperties;
+import com.ym.mec.education.base.BaseResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.persistence.GenerationType;
+
+/**
+ * @author : chengp
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 17:39
+ */
+@RestController(value = "musicGroup")
+@DefaultProperties(defaultFallback = "defaultFallback")
+@Slf4j
+public class MusicGroupController {
+    /**
+     * 服务降级处理
+     *
+     * @return
+     */
+    private BaseResponse defaultFallback() {
+        BaseResponse response = new BaseResponse();
+        response.setReturnCode(500);
+        response.setMessage("太拥挤了, 请稍后再试!");
+        return response;
+    }
+
+    @GetMapping(value = "/say")
+    public String say(){
+
+        return  "utyrewertyu";
+    }
+}

mec-education/src/main/java/com/ym/mec/education/entity/ChargeType.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/ChargeTypeSubjectMapper.java

@@ -2,10 +2,12 @@ package com.ym.mec.education.entity;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
 import java.io.Serializable;
 
 /**

mec-education/src/main/java/com/ym/mec/education/entity/ClassGroup.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/ClassGroupRelation.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -81,10 +81,10 @@ public class ClassGroupRelation extends Model<ClassGroupRelation> {
     @Override
     public String toString() {
         return "ClassGroupRelation{" +
-        ", id=" + id +
-        ", classGroupId=" + classGroupId +
-        ", subClassGroupId=" + subClassGroupId +
-        ", createTime=" + createTime +
-        "}";
+                ", id=" + id +
+                ", classGroupId=" + classGroupId +
+                ", subClassGroupId=" + subClassGroupId +
+                ", createTime=" + createTime +
+                "}";
     }
 }

mec-education/src/main/java/com/ym/mec/education/entity/ClassGroupStudentMapper.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/ClassGroupTeacherMapper.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/ClassGroupTeacherSalary.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/CooperationOrgan.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/CourseHomework.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/CourseHomeworkTemplate.java

@@ -1,11 +1,11 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 
 /**

mec-education/src/main/java/com/ym/mec/education/entity/CourseSchedule.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/CourseScheduleTeacherSalary.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/DemoGroup.java

@@ -1,11 +1,12 @@
 package com.ym.mec.education.entity;
 
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -20,7 +21,7 @@ public class DemoGroup extends Model<DemoGroup> {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId("id_")
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     @TableField("name_")
     private String name;

mec-education/src/main/java/com/ym/mec/education/entity/DemoGroupClassGroupMapper.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/DemoGroupCoursesPlan.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/Employee.java

@@ -1,10 +1,11 @@
 package com.ym.mec.education.entity;
 
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -14,6 +15,7 @@ import java.io.Serializable;
  * @author lemeng
  * @since 2019-09-25
  */
+@TableName("employee")
 public class Employee extends Model<Employee> {
 
     private static final long serialVersionUID = 1L;

mec-education/src/main/java/com/ym/mec/education/entity/Goods.java

@@ -1,12 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import java.io.Serializable;
 
 /**
  * <p>
@@ -16,6 +17,7 @@ import java.io.Serializable;
  * @author lemeng
  * @since 2019-09-25
  */
+@TableName("goods")
 public class Goods extends Model<Goods> {
 
     private static final long serialVersionUID = 1L;

mec-education/src/main/java/com/ym/mec/education/entity/GoodsCategory.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/GoodsOrder.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/GoodsOrderItem.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/GoodsOrderPayment.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/HotWordsLabel.java

@@ -1,11 +1,11 @@
 package com.ym.mec.education.entity;
 
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/LeaveCategory.java

@@ -1,11 +1,11 @@
 package com.ym.mec.education.entity;
 
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroup.java

@@ -1,10 +1,10 @@
 package com.ym.mec.education.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
 
 /**

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupBuildLog.java

@@ -1,11 +1,11 @@
 package com.ym.mec.education.entity;
 
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupPaymentCalender.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupPaymentEntities.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupPurchaseList.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupStudentFee.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupSubjectGoodsGroup.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/MusicGroupSubjectPlan.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/Organization.java

@@ -1,11 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -15,6 +16,7 @@ import java.io.Serializable;
  * @author lemeng
  * @since 2019-09-25
  */
+@TableName("organization")
 public class Organization extends Model<Organization> {
 
     private static final long serialVersionUID = 1L;

mec-education/src/main/java/com/ym/mec/education/entity/RongyunRoom.java

@@ -1,16 +1,16 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author lemeng

mec-education/src/main/java/com/ym/mec/education/entity/RongyunRoomMember.java

@@ -1,16 +1,16 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author lemeng

mec-education/src/main/java/com/ym/mec/education/entity/RongyunUser.java

@@ -1,16 +1,16 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author lemeng

mec-education/src/main/java/com/ym/mec/education/entity/RongyunWhiteboard.java

@@ -1,16 +1,16 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author lemeng

mec-education/src/main/java/com/ym/mec/education/entity/School.java

@@ -1,12 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import java.io.Serializable;
 
 /**
  * <p>
@@ -16,6 +17,7 @@ import java.io.Serializable;
  * @author lemeng
  * @since 2019-09-25
  */
+@TableName("school")
 public class School extends Model<School> {
 
     private static final long serialVersionUID = 1L;

mec-education/src/main/java/com/ym/mec/education/entity/StudentApplyRefunds.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/StudentAttendance.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/StudentCourseHomework.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/StudentCourseHomeworkReply.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/StudentPaymentOrder.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/StudentPaymentOrderDetail.java

@@ -1,13 +1,13 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/StudentRecharge.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/StudentRegistration.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/StudentWithdraw.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/Subject.java

@@ -1,11 +1,11 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -106,13 +106,13 @@ public class Subject extends Model<Subject> {
     @Override
     public String toString() {
         return "Subject{" +
-        ", id=" + id +
-        ", name=" + name +
-        ", code=" + code +
-        ", parentSubjectId=" + parentSubjectId +
-        ", createTime=" + createTime +
-        ", updateTime=" + updateTime +
-        ", delFlag=" + delFlag +
-        "}";
+                ", id=" + id +
+                ", name=" + name +
+                ", code=" + code +
+                ", parentSubjectId=" + parentSubjectId +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", delFlag=" + delFlag +
+                "}";
     }
 }

mec-education/src/main/java/com/ym/mec/education/entity/SubjectGoodsMapper.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysArea.java

@@ -1,11 +1,11 @@
 package com.ym.mec.education.entity;
 
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysAuditLog.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysMenu.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysMessage.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysMessageConfig.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysNewsInformation.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysOauthClientDetails.java

@@ -1,9 +1,9 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 
 /**
@@ -177,17 +177,17 @@ public class SysOauthClientDetails extends Model<SysOauthClientDetails> {
     @Override
     public String toString() {
         return "SysOauthClientDetails{" +
-        ", id=" + id +
-        ", resourceIds=" + resourceIds +
-        ", clientSecret=" + clientSecret +
-        ", scope=" + scope +
-        ", authorizedGrantTypes=" + authorizedGrantTypes +
-        ", webServerRedirectUri=" + webServerRedirectUri +
-        ", authorities=" + authorities +
-        ", accessTokenValidity=" + accessTokenValidity +
-        ", refreshTokenValidity=" + refreshTokenValidity +
-        ", additionalInformation=" + additionalInformation +
-        ", autoapprove=" + autoapprove +
-        "}";
+                ", id=" + id +
+                ", resourceIds=" + resourceIds +
+                ", clientSecret=" + clientSecret +
+                ", scope=" + scope +
+                ", authorizedGrantTypes=" + authorizedGrantTypes +
+                ", webServerRedirectUri=" + webServerRedirectUri +
+                ", authorities=" + authorities +
+                ", accessTokenValidity=" + accessTokenValidity +
+                ", refreshTokenValidity=" + refreshTokenValidity +
+                ", additionalInformation=" + additionalInformation +
+                ", autoapprove=" + autoapprove +
+                "}";
     }
 }

mec-education/src/main/java/com/ym/mec/education/entity/SysRole.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysRoleMenu.java

@@ -1,9 +1,9 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 
 /**

mec-education/src/main/java/com/ym/mec/education/entity/SysSuggestion.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysTask.java

@@ -1,11 +1,11 @@
 package com.ym.mec.education.entity;
 
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysUser.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysUserBankCard.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/entity/SysUserCashAccount.java

@@ -1,12 +1,12 @@
 package com.ym.mec.education.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
 
 /**
  * <p>