Merge remote-tracking branch 'origin/master'

This commit is contained in:
Renpc-kilig 2021-05-03 17:41:24 +08:00
commit 97c1ce7944
7 changed files with 18 additions and 18 deletions

View File

@ -1,8 +1,8 @@
package cn.com.tenlion.teacher.controller.apis;
package cn.com.tenlion.controller.api.teacher;
import cn.com.tenlion.teacher.pojo.dtos.TeacherDTO;
import cn.com.tenlion.teacher.pojo.vos.TeacherVO;
import cn.com.tenlion.teacher.service.ITeacherService;
import cn.com.tenlion.pojo.dtos.teacher.TeacherDTO;
import cn.com.tenlion.pojo.vos.teacher.TeacherVO;
import cn.com.tenlion.service.service.ITeacherService;
import ink.wgink.common.base.DefaultBaseController;
import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SearchException;

View File

@ -1,6 +1,6 @@
package cn.com.tenlion.teacher.dao.teacher;
package cn.com.tenlion.dao.teacher;
import cn.com.tenlion.teacher.pojo.dtos.TeacherDTO;
import cn.com.tenlion.pojo.dtos.teacher.TeacherDTO;
import org.springframework.stereotype.Repository;
import java.util.List;

View File

@ -1,4 +1,4 @@
package cn.com.tenlion.teacher.pojo.dtos;
package cn.com.tenlion.pojo.dtos.teacher;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package cn.com.tenlion.teacher.pojo.vos;
package cn.com.tenlion.pojo.vos.teacher;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

View File

@ -1,7 +1,7 @@
package cn.com.tenlion.teacher.service;
package cn.com.tenlion.service.service;
import cn.com.tenlion.teacher.pojo.dtos.TeacherDTO;
import cn.com.tenlion.teacher.pojo.vos.TeacherVO;
import cn.com.tenlion.pojo.dtos.teacher.TeacherDTO;
import cn.com.tenlion.pojo.vos.teacher.TeacherVO;
import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SearchException;
import ink.wgink.pojo.ListPage;

View File

@ -1,9 +1,9 @@
package cn.com.tenlion.teacher.service.impl;
package cn.com.tenlion.service.service.impl;
import cn.com.tenlion.teacher.dao.teacher.ITeacherDao;
import cn.com.tenlion.teacher.pojo.dtos.TeacherDTO;
import cn.com.tenlion.teacher.pojo.vos.TeacherVO;
import cn.com.tenlion.teacher.service.ITeacherService;
import cn.com.tenlion.dao.teacher.ITeacherDao;
import cn.com.tenlion.pojo.dtos.teacher.TeacherDTO;
import cn.com.tenlion.pojo.vos.teacher.TeacherVO;
import cn.com.tenlion.service.service.ITeacherService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import ink.wgink.common.base.DefaultBaseService;

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.com.tenlion.teacher.dao.teacher.ITeacherDao">
<mapper namespace="cn.com.tenlion.dao.teacher.ITeacherDao">
<resultMap id="teacherDTO" type="cn.com.tenlion.teacher.pojo.dtos.TeacherDTO">
<resultMap id="teacherDTO" type="cn.com.tenlion.pojo.dtos.teacher.TeacherDTO">
<id column="teacher_id" property="teacherId"></id>
<result column="org_id" property="orgId"/>
<result column="certificate_no" property="certificateNo"/>