Commits · 73eaeb7a36965ff44468cb38cb2677fc909bc924 · 李丛阳 / education

30 May, 2018 1 commit
- 编辑排课接口修改子任务做物理删除 · 73eaeb7a
  刘子正 authored May 30, 2018
  
  73eaeb7a
17 May, 2018 7 commits
- BLesson/queryBLessonsByPagination · 5401980c
  刘子正 authored May 17, 2018
```
lessonName+code

BTeacher/queryBTeachersByPagination
name+code

BStudent/queryBStudentsByPagination
name+code

brooms/queryBRoomsByPagination
classroomName+code

模糊查询条件合并
```
  5401980c
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 5ea86a4b
  刘子正 authored May 17, 2018
  
  5ea86a4b
- BCompany删除接口 sql语句修改 · 58fbe27a
  刘子正 authored May 17, 2018
  
  58fbe27a
- 增加子任务与子公司的排序显示 · 22d93a87
  李博今 authored May 17, 2018
  
  22d93a87
- 修改角色删除错误提示 · 0945809f
  李博今 authored May 17, 2018
  
  0945809f
- dto排序修改 · c6dcad00
  李博今 authored May 17, 2018
  
  c6dcad00
- dto排序修改 · 6d46cadf
  李博今 authored May 17, 2018
  
  6d46cadf
16 May, 2018 24 commits
- 校历修改 · e1b0f272
  李博今 authored May 16, 2018
  
  e1b0f272
- 校历修改 · e4e62ce6
  李博今 authored May 16, 2018
  
  e4e62ce6
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · d72d2c43
  李博今 authored May 16, 2018
  
  d72d2c43
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 125caf15
  李博今 authored May 16, 2018
```
# Conflicts:
#	sql/edu_update.sql
```
  125caf15
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3 · a670eace
  YangZhaoJun1 authored May 16, 2018
```
# Conflicts:
#	src/main/java/org/rcisoft/core/result/ResultServiceEnums.java
```
  a670eace
- 解决bug · 59ae488b
  YangZhaoJun1 authored May 16, 2018
  
  59ae488b
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 30b3e9b2
  李博今 authored May 16, 2018
  
  30b3e9b2
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 091d0933
  李博今 authored May 16, 2018
```
# Conflicts:
#	sql/edu_update.sql
```
  091d0933
- Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education · 177bfb17
  hanshuai authored May 16, 2018
```
# Conflicts:
#	src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java
```
  177bfb17
- 完善导入排课 · 3f96a75b
  李博今 authored May 16, 2018
  
  3f96a75b
- 完善导入排课 · 132c723b
  李博今 authored May 16, 2018
  
  132c723b
- Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education · 775e3eb2
  hanshuai authored May 16, 2018
```
# Conflicts:
#	src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java
```
  775e3eb2
- Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education · c46adda4
  hanshuai authored May 16, 2018
```
# Conflicts:
#	src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java
```
  c46adda4
- Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education · b8e1b9d1
  hanshuai authored May 16, 2018
```
# Conflicts:
#	src/main/java/org/rcisoft/core/result/ResultServiceEnums.java
#	src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java
```
  b8e1b9d1
- 教师BTeacher、学生BStudent、班级BClass、教室BRooms、角色SysRole、用户SysUser 改为物理删除，统一异常编号 · 3856c8c6
  刘子正 authored May 16, 2018
  
  3856c8c6
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · b4ab840c
  刘子正 authored May 16, 2018
  
  b4ab840c
- 添加排课接口新增空值验证 · 74cda19e
  刘子正 authored May 16, 2018
  
  74cda19e
- Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education · 205baad6
  hanshuai authored May 16, 2018
  
  205baad6
- Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education · fd2711d5
  hanshuai authored May 16, 2018
```
# Conflicts:
#	src/main/java/org/rcisoft/core/result/ResultServiceEnums.java
#	src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java
```
  fd2711d5
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 1d1e93cb
  刘子正 authored May 16, 2018
  
  1d1e93cb
- 排课接口修改 · c841647f
  刘子正 authored May 16, 2018
  
  c841647f
- 删除教师 · e27c569b
  李丛阳 authored May 16, 2018
  
  e27c569b
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3 · daa195a0
  YangZhaoJun1 authored May 16, 2018
  
  daa195a0
- 解决bug · 6db006ee
  YangZhaoJun1 authored May 16, 2018
  
  6db006ee
15 May, 2018 8 commits
- 更新教室导入的筛选，返回正确信息 · 9a97ed2e
  李博今 authored May 15, 2018
  
  9a97ed2e
- 教室被使用不可删除 · 7fb73128
  李博今 authored May 15, 2018
  
  7fb73128
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · ce185e52
  李博今 authored May 15, 2018
  
  ce185e52
- 删除重复模板，修改教室模板 · 07ac3917
  李博今 authored May 15, 2018
  
  07ac3917
- 删除用户 · 27427528
  李丛阳 authored May 15, 2018
  
  27427528
- 删除用户 · 1ab8e481
  李丛阳 authored May 15, 2018
  
  1ab8e481
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3 · 25aa2e25
  YangZhaoJun1 authored May 15, 2018
  
  25aa2e25
- 解决bug · cd75f586
  YangZhaoJun1 authored May 15, 2018
  
  cd75f586