Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/pom.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.ym</groupId>
+		<artifactId>mec</artifactId>
+		<version>1.0</version>
+	</parent>
+	<artifactId>mec-biz</artifactId>
+	<name>mec-biz</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.ym</groupId>
+			<artifactId>common-core</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.ym</groupId>
+			<artifactId>mec-auth-api</artifactId>
+		</dependency>
+	</dependencies>
+</project>

mec-web/src/main/java/com/ym/mec/web/dal/dao/ChargeTypeDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ChargeTypeDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.ChargeType;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.ChargeType;
 
 public interface ChargeTypeDao extends BaseDAO<Integer, ChargeType> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/ChargeTypeSubjectMapperDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ChargeTypeSubjectMapperDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.ChargeTypeSubjectMapper;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.ChargeTypeSubjectMapper;
 
 public interface ChargeTypeSubjectMapperDao extends BaseDAO<Long, ChargeTypeSubjectMapper> {
 

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

@@ -1,9 +1,10 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+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.web.dal.dto.TeacherMusicClassInfoDto;
-import com.ym.mec.web.dal.dto.TeacherVipClassInfoDto;
-import com.ym.mec.web.dal.entity.ClassGroup;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/ClassGroupRelationDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupRelationDao.java

@@ -1,7 +1,8 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.ClassGroupRelation;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.ClassGroupRelation;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/ClassGroupStudentMapperDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupStudentMapperDao.java

@@ -1,7 +1,8 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.ClassGroupStudentMapper;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.ClassGroupStudentMapper;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

@@ -1,7 +1,8 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.ClassGroupTeacherMapper;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/CooperationOrganDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CooperationOrganDao.java

@@ -1,11 +1,11 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.CooperationOrgan;
 
 public interface CooperationOrganDao extends BaseDAO<Integer, CooperationOrgan> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/CourseHomeworkDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseHomeworkDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.CourseHomework;
 
 public interface CourseHomeworkDao extends BaseDAO<Long, CourseHomework> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/CourseHomeworkTemplateDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseHomeworkTemplateDao.java

@@ -1,7 +1,8 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.CourseHomeworkTemplate;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.CourseHomeworkTemplate;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface CourseHomeworkTemplateDao extends BaseDAO<Integer, CourseHomeworkTemplate> {

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

@@ -1,9 +1,10 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+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.dal.BaseDAO;
-import com.ym.mec.web.dal.dto.CourseScheduleDto;
-import com.ym.mec.web.dal.dto.TeacherAttendanceDto;
-import com.ym.mec.web.dal.entity.CourseSchedule;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;

mec-web/src/main/java/com/ym/mec/web/dal/dao/CourseScheduleTeacherSalaryDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleTeacherSalaryDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.CourseScheduleTeacherSalary;
 
 public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseScheduleTeacherSalary> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/EmployeeDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/EmployeeDao.java

@@ -1,8 +1,9 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.EmployeeDto;
+import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.dto.EmployeeDto;
-import com.ym.mec.web.dal.entity.Employee;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/GoodsCategoryDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/GoodsCategoryDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.GoodsCategory;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.GoodsCategory;
 
 public interface GoodsCategoryDao extends BaseDAO<Integer, GoodsCategory> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/GoodsDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/GoodsDao.java

@@ -1,7 +1,8 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.Goods;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/GoodsOrderDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/GoodsOrderDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.GoodsOrder;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.GoodsOrder;
 
 public interface GoodsOrderDao extends BaseDAO<Long, GoodsOrder> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/GoodsOrderItemDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/GoodsOrderItemDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.GoodsOrderItem;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.GoodsOrderItem;
 
 public interface GoodsOrderItemDao extends BaseDAO<Long, GoodsOrderItem> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/GoodsOrderPaymentDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/GoodsOrderPaymentDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.GoodsOrderPayment;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.GoodsOrderPayment;
 
 public interface GoodsOrderPaymentDao extends BaseDAO<Long, GoodsOrderPayment> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/HotWordsLabelDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/HotWordsLabelDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.HotWordsLabel;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.HotWordsLabel;
 
 public interface HotWordsLabelDao extends BaseDAO<Integer, HotWordsLabel> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/LeaveCategoryDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/LeaveCategoryDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.LeaveCategory;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.LeaveCategory;
 
 public interface LeaveCategoryDao extends BaseDAO<Integer, LeaveCategory> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupBuildLogDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupBuildLogDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.MusicGroupBuildLog;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.MusicGroupBuildLog;
 
 public interface MusicGroupBuildLogDao extends BaseDAO<Integer, MusicGroupBuildLog> {
 

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

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.MusicGroup;
 
 public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupPaymentCalenderDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.MusicGroupPaymentCalender;
 
 public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPaymentCalender> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupPaymentEntitiesDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentEntitiesDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentEntities;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.MusicGroupPaymentEntities;
 
 public interface MusicGroupPaymentEntitiesDao extends BaseDAO<Integer, MusicGroupPaymentEntities> {
 }

mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupPurchaseListDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPurchaseListDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.MusicGroupPurchaseList;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.MusicGroupPurchaseList;
 
 public interface MusicGroupPurchaseListDao extends BaseDAO<Integer, MusicGroupPurchaseList> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupStudentFeeDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupStudentFeeDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.MusicGroupStudentFee;
 
 public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudentFee> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupSubjectGoodsGroupDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupSubjectGoodsGroupDao.java

@@ -1,7 +1,8 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/MusicGroupSubjectPlanDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupSubjectPlanDao.java

@@ -1,7 +1,8 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.MusicGroupSubjectPlan;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/OrganizationDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/OrganizationDao.java

@@ -1,11 +1,11 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.Organization;
 
 public interface OrganizationDao extends BaseDAO<Integer, Organization> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/SchoolDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SchoolDao.java

@@ -1,8 +1,9 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.School;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.School;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/StudentApplyRefundsDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentApplyRefundsDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.StudentApplyRefunds;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.StudentApplyRefunds;
 
 public interface StudentApplyRefundsDao extends BaseDAO<Long, StudentApplyRefunds> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/StudentAttendanceDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentAttendanceDao.java

@@ -1,9 +1,10 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.StudentPersonalAttendanceDto;
+import com.ym.mec.biz.dal.dto.StudentStatusCountUtilEntity;
+import com.ym.mec.biz.dal.entity.StudentAttendance;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.dto.StudentPersonalAttendanceDto;
-import com.ym.mec.web.dal.dto.StudentStatusCountUtilEntity;
-import com.ym.mec.web.dal.entity.StudentAttendance;
+
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/StudentCourseHomeworkDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentCourseHomeworkDao.java

@@ -1,8 +1,9 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
+import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.dto.CourseHomeworkStudentDetailDto;
-import com.ym.mec.web.dal.entity.StudentCourseHomework;
+
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/StudentCourseHomeworkReplyDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentCourseHomeworkReplyDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.StudentCourseHomeworkReply;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.StudentCourseHomeworkReply;
 
 import java.util.List;
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/StudentManageDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentManageDao.java

@@ -1,6 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.dto.*;
 
-import com.ym.mec.web.dal.dto.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/StudentPaymentOrderDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.StudentPaymentOrder;
 
 public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrder> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/StudentPaymentOrderDetailDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDetailDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.StudentPaymentOrderDetail;
 
 public interface StudentPaymentOrderDetailDao extends BaseDAO<Long, StudentPaymentOrderDetail> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/StudentRechargeDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRechargeDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.StudentRecharge;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.StudentRecharge;
 
 public interface StudentRechargeDao extends BaseDAO<String, StudentRecharge> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/StudentRegistrationDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -1,9 +1,10 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
+import com.ym.mec.biz.dal.dto.StudentFeeDto;
+import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.dto.StudentFeeDto;
-import com.ym.mec.web.dal.entity.StudentRegistration;
-import com.ym.mec.web.dal.dto.StudentApplyDetailDto;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/StudentWithdrawDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentWithdrawDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.StudentWithdraw;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.StudentWithdraw;
 
 public interface StudentWithdrawDao extends BaseDAO<String, StudentWithdraw> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/SubjectDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SubjectDao.java

@@ -1,9 +1,10 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.SubjectApplyDetailDto;
+import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.dto.SubjectApplyDetailDto;
-import com.ym.mec.web.dal.entity.Subject;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/SubjectGoodsMapperDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SubjectGoodsMapperDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.SubjectGoodsMapper;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.SubjectGoodsMapper;
 
 public interface SubjectGoodsMapperDao extends BaseDAO<Long, SubjectGoodsMapper> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/SysAreaDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysAreaDao.java

@@ -1,9 +1,10 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.TreeDto;
+import com.ym.mec.biz.dal.entity.SysArea;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.dto.TreeDto;
-import com.ym.mec.web.dal.entity.SysArea;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/SysMessageConfigDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMessageConfigDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.SysMessageConfig;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.SysMessageConfig;
 
 public interface SysMessageConfigDao extends BaseDAO<Integer, SysMessageConfig> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/SysMessageDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMessageDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.SysMessage;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.SysMessage;
 
 public interface SysMessageDao extends BaseDAO<Long, SysMessage> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/SysSuggestionDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysSuggestionDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.SysSuggestion;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.SysSuggestion;
 
 public interface SysSuggestionDao extends BaseDAO<Long, SysSuggestion> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/SysUserCashAccountDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysUserCashAccountDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.SysUserCashAccount;
 
 public interface SysUserCashAccountDao extends BaseDAO<Integer, SysUserCashAccount> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/SysUserCashAccountDetailDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysUserCashAccountDetailDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.SysUserCashAccountDetail;
 
 public interface SysUserCashAccountDetailDao extends BaseDAO<Long, SysUserCashAccountDetail> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/TeacherAttendanceDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherAttendanceDao.java

@@ -1,8 +1,8 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.TeacherPersonalAttendanceDto;
+import com.ym.mec.biz.dal.entity.TeacherAttendance;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.dto.TeacherPersonalAttendanceDto;
-import com.ym.mec.web.dal.entity.TeacherAttendance;
 
 import java.util.List;
 import java.util.Map;

mec-web/src/main/java/com/ym/mec/web/dal/dao/TeacherDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -1,8 +1,9 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.Teacher;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface TeacherDao extends BaseDAO<Integer, Teacher> {

mec-web/src/main/java/com/ym/mec/web/dal/dao/TeacherDefaultMusicGroupSalaryDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDefaultMusicGroupSalaryDao.java

@@ -1,8 +1,9 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.TeacherDefaultMusicGroupSalary;
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.TeacherDefaultMusicGroupSalary;
-import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

mec-web/src/main/java/com/ym/mec/web/dal/dao/TeacherLeaveRecordDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherLeaveRecordDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.TeacherLeaveRecord;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.TeacherLeaveRecord;
 
 public interface TeacherLeaveRecordDao extends BaseDAO<Long, TeacherLeaveRecord> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/TeacherSchoolDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherSchoolDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.TeacherSchool;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.TeacherSchool;
 
 public interface TeacherSchoolDao extends BaseDAO<Long, TeacherSchool> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/VipGroupCategoryDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupCategoryDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.VipGroupCategory;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.VipGroupCategory;
 
 public interface VipGroupCategoryDao extends BaseDAO<Integer, VipGroupCategory> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/VipGroupClassGroupMapperDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupClassGroupMapperDao.java

@@ -1,7 +1,7 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.entity.VipGroupClassGroupMapper;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.VipGroupClassGroupMapper;
 
 public interface VipGroupClassGroupMapperDao extends BaseDAO<Long, VipGroupClassGroupMapper> {
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/VipGroupDao.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupDao.java

@@ -1,8 +1,8 @@
-package com.ym.mec.web.dal.dao;
+package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.StudentManageVipGroupDto;
+import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.dto.StudentManageVipGroupDto;
-import com.ym.mec.web.dal.entity.VipGroup;
 
 import java.util.List;
 

mec-web/src/main/java/com/ym/mec/web/dal/dto/CourseHomeworkListDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkListDto.java

@@ -1,11 +1,12 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/19

mec-web/src/main/java/com/ym/mec/web/dal/dto/CourseHomeworkStudentDetailDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkStudentDetailDto.java

@@ -1,10 +1,11 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/18

mec-web/src/main/java/com/ym/mec/web/dal/dto/CourseScheduleDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleDto.java

@@ -1,9 +1,10 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.entity.CourseSchedule;
-import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/17

mec-web/src/main/java/com/ym/mec/web/dal/dto/EmployeeDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/EmployeeDto.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.common.enums.UserGenderEnum;
 import io.swagger.annotations.ApiModelProperty;

mec-web/src/main/java/com/ym/mec/web/dal/dto/HighClassGroup.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/HighClassGroup.java

@@ -1,13 +1,13 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.entity.ClassGroup;
-import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.ym.mec.biz.dal.entity.ClassGroup;
+
 /**
  * 提交班
  */

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentApplyDetailDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentApplyDetailDto.java

@@ -1,12 +1,10 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.enums.UserGenderEnum;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
-
-import java.math.BigDecimal;
+import com.ym.mec.common.page.QueryInfo;
 
 public class StudentApplyDetailDto extends QueryInfo {
 

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentAttendanceViewDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentAttendanceViewDto.java

@@ -1,8 +1,9 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.enums.StudentAttendanceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/11

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentCourseHomeworkCommentDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentCourseHomeworkCommentDto.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentCourseHomeworkReplyDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentCourseHomeworkReplyDto.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentFeeDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentFeeDto.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentManageAccountBaseInfoDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageAccountBaseInfoDto.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentManageBaseDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageBaseDto.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentManageBaseInfoOfMusicGroupDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageBaseInfoOfMusicGroupDto.java

@@ -1,13 +1,14 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ym.mec.web.dal.enums.KitPurchaseMethodEnum;
-import com.ym.mec.web.dal.enums.MusicGroupStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ym.mec.biz.dal.enums.KitPurchaseMethodEnum;
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/19

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentManageCourseListDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageCourseListDto.java

@@ -1,12 +1,13 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.web.dal.enums.CourseStatusEnum;
-import com.ym.mec.web.dal.enums.StudentAttendanceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
+import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/20

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentManageListDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageListDto.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.common.enums.UserGenderEnum;
 import io.swagger.annotations.ApiModelProperty;

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentManageVipGroupDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageVipGroupDto.java

@@ -1,8 +1,9 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.entity.VipGroup;
 import io.swagger.annotations.ApiModelProperty;
 
+import com.ym.mec.biz.dal.entity.VipGroup;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/20

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentPersonalAttendanceDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentPersonalAttendanceDto.java

@@ -1,11 +1,12 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.web.dal.enums.StudentAttendanceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/16

mec-web/src/main/java/com/ym/mec/web/dal/dto/StudentStatusCountUtilEntity.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentStatusCountUtilEntity.java

@@ -1,8 +1,9 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.enums.StudentAttendanceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/12

mec-web/src/main/java/com/ym/mec/web/dal/dto/SubFeeSettingDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SubFeeSettingDto.java

@@ -1,13 +1,14 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.entity.MusicGroup;
-import com.ym.mec.web.dal.entity.MusicGroupPaymentEntities;
-import com.ym.mec.web.dal.entity.MusicGroupSubjectGoodsGroup;
-import com.ym.mec.web.dal.entity.MusicGroupSubjectPlan;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentEntities;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
+
 public class SubFeeSettingDto {
 
     @ApiModelProperty(value = "乐团明细",required = false)

mec-web/src/main/java/com/ym/mec/web/dal/dto/SubjectApplyDetailDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SubjectApplyDetailDto.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 

mec-web/src/main/java/com/ym/mec/web/dal/dto/TeacherAttendanceDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherAttendanceDto.java

@@ -1,11 +1,12 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.enums.CourseStatusEnum;
-import com.ym.mec.web.dal.enums.ParamEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
+import com.ym.mec.biz.dal.enums.ParamEnum;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/10

mec-web/src/main/java/com/ym/mec/web/dal/dto/TeacherMusicClassInfoDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherMusicClassInfoDto.java

@@ -1,10 +1,12 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.enums.JobNatureEnum;
-import com.ym.mec.web.dal.enums.MusicGroupStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.util.List;
 
+import com.ym.mec.biz.dal.enums.JobNatureEnum;
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+
 /**
  * 老师乐团课程信息
  */

mec-web/src/main/java/com/ym/mec/web/dal/dto/TeacherPersonalAttendanceDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherPersonalAttendanceDto.java

@@ -1,11 +1,12 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/16

mec-web/src/main/java/com/ym/mec/web/dal/dto/TeacherSignOutDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherSignOutDto.java

@@ -1,9 +1,10 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.entity.CourseHomework;
-import com.ym.mec.web.dal.entity.TeacherAttendance;
 import io.swagger.annotations.ApiModelProperty;
 
+import com.ym.mec.biz.dal.entity.CourseHomework;
+import com.ym.mec.biz.dal.entity.TeacherAttendance;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/18

mec-web/src/main/java/com/ym/mec/web/dal/dto/TeacherUserDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherUserDto.java

@@ -1,13 +1,14 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.web.dal.enums.JobNatureEnum;
-import com.ym.mec.web.dal.enums.JobTypeEnum;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.JobNatureEnum;
+import com.ym.mec.biz.dal.enums.JobTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+
 public class TeacherUserDto extends SysUser {
 
     @ApiModelProperty(value = "职务类型（指导老师 ADVISER、教务老师 ACADEMIC、教学主管 TEACHING）", required = false)

mec-web/src/main/java/com/ym/mec/web/dal/dto/TeacherVipClassInfoDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherVipClassInfoDto.java

@@ -1,14 +1,12 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.enums.AuditStatusEnum;
-import com.ym.mec.web.dal.enums.CourseStatusEnum;
-import com.ym.mec.web.dal.enums.JobNatureEnum;
-import com.ym.mec.web.dal.enums.MusicGroupStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
+
+import com.ym.mec.biz.dal.enums.AuditStatusEnum;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 
 /**
  * 老师Vip课程信息

mec-web/src/main/java/com/ym/mec/web/dal/dto/TreeDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TreeDto.java

@@ -1,8 +1,9 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+
 public class TreeDto {
     @ApiModelProperty(value = "父节点编号，默认0",required = false)
     private Integer parentId = 0;

mec-web/src/main/java/com/ym/mec/web/dal/dto/VipGroupApplyBaseInfoDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupApplyBaseInfoDto.java

@@ -1,10 +1,11 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.entity.VipGroup;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 
+import com.ym.mec.biz.dal.entity.VipGroup;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/21

mec-web/src/main/java/com/ym/mec/web/dal/dto/VipGroupApplyDto.java → mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupApplyDto.java

@@ -1,10 +1,11 @@
-package com.ym.mec.web.dal.dto;
+package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.web.dal.entity.CourseSchedule;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
+import com.ym.mec.biz.dal.entity.CourseSchedule;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/21

mec-web/src/main/java/com/ym/mec/web/dal/entity/ChargeType.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ChargeType.java

@@ -1,7 +1,9 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**

mec-web/src/main/java/com/ym/mec/web/dal/entity/ChargeTypeSubjectMapper.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ChargeTypeSubjectMapper.java

@@ -1,7 +1,9 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 
-import com.ym.mec.web.dal.enums.KitGroupPurchaseTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;

mec-web/src/main/java/com/ym/mec/web/dal/entity/ClassGroup.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroup.java

@@ -1,11 +1,11 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
 /**
  * 对应数据库表(class_group):

mec-web/src/main/java/com/ym/mec/web/dal/entity/ClassGroup4Teacher.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroup4Teacher.java

@@ -1,7 +1,9 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 
-import com.ym.mec.web.dal.enums.MusicGroupStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**

mec-web/src/main/java/com/ym/mec/web/dal/entity/ClassGroupRelation.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupRelation.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

mec-web/src/main/java/com/ym/mec/web/dal/entity/ClassGroupStudentMapper.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupStudentMapper.java

@@ -1,7 +1,9 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
 
-import com.ym.mec.web.dal.enums.ClassGroupStudentStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**

mec-web/src/main/java/com/ym/mec/web/dal/entity/ClassGroupTeacherMapper.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupTeacherMapper.java

@@ -1,7 +1,9 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 
-import com.ym.mec.web.dal.enums.TeachTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;

mec-web/src/main/java/com/ym/mec/web/dal/entity/CooperationOrgan.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CooperationOrgan.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseHomework.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseHomework.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseHomeworkTemplate.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseHomeworkTemplate.java

@@ -1,8 +1,10 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
-import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**

mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseSchedule.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -1,8 +1,10 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
 
-import com.ym.mec.web.dal.enums.CourseStatusEnum;
-import com.ym.mec.web.dal.enums.TeachModeEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**

mec-web/src/main/java/com/ym/mec/web/dal/entity/CourseScheduleTeacherSalary.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleTeacherSalary.java

@@ -1,4 +1,4 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

mec-web/src/main/java/com/ym/mec/web/dal/entity/Employee.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Employee.java

@@ -1,8 +1,10 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.JobNatureEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
-import com.ym.mec.web.dal.enums.JobNatureEnum;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**

mec-web/src/main/java/com/ym/mec/web/dal/entity/Goods.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Goods.java

@@ -1,7 +1,9 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;

mec-web/src/main/java/com/ym/mec/web/dal/entity/GoodsCategory.java → mec-biz/src/main/java/com/ym/mec/biz/dal/entity/GoodsCategory.java

@@ -1,7 +1,9 @@
-package com.ym.mec.web.dal.entity;
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.List;