Commits · 88d241eb863ec5bb04c21dba2b68defb1a013fb1 · 李丛阳 / education

24 May, 2018 5 commits
- 修改教室的数据库存储 · 88d241eb
  李博今 authored May 24, 2018
  
  88d241eb
- 修改教室的数据库存储 · 460f091b
  李博今 authored May 24, 2018
  
  460f091b
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · b4b04873
  李博今 authored May 24, 2018
  
  b4b04873
- 周视图不变 · b658a5f8
  李博今 authored May 24, 2018
  
  b658a5f8
- 修改类型与周视图 · a16da2c1
  李博今 authored May 24, 2018
  
  a16da2c1
23 May, 2018 8 commits
- 项目重新启动，容器的定时关闭任务 · e7a0c25d
  YangZhaoJun1 authored May 23, 2018
  
  e7a0c25d
- 修改关于章节状态的改变 · 78532c09
  李博今 authored May 23, 2018
  
  78532c09
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · cf65e8fc
  李博今 authored May 23, 2018
  
  cf65e8fc
- 导入排课方法更新 · f28f7415
  李博今 authored May 23, 2018
  
  f28f7415
- logbak文件 · 17895f14
  YangZhaoJun1 authored May 23, 2018
  
  17895f14
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3 · 0c33896f
  YangZhaoJun1 authored May 23, 2018
  
  0c33896f
- 解决bug，修改配置文件 · 567f478d
  YangZhaoJun1 authored May 23, 2018
  
  567f478d
- 导入排课方法更新 · 3f6b314d
  李博今 authored May 23, 2018
  
  3f6b314d
21 May, 2018 9 commits
- Merge branch 'master' into V2.0.3 · 73768a8b
  YangZhaoJun1 authored May 21, 2018
  
  73768a8b
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3 · abfcaead
  YangZhaoJun1 authored May 21, 2018
  
  abfcaead
- 解决bug · 17bfb0b9
  YangZhaoJun1 authored May 21, 2018
  
  17bfb0b9
- Merge branch 'master' of http://103.249.252.28:90/lcy/education · 6858d9d1
  YangZhaoJun1 authored May 21, 2018
```
# Conflicts:
#	src/main/java/org/rcisoft/business/bstudent/service/impl/BStudentServiceImpl.java
#	src/main/java/org/rcisoft/business/bteacher/dao/BTeacherRepository.java
#	src/main/java/org/rcisoft/business/bteacher/service/impl/BTeacherServiceImpl.java
#	src/main/java/org/rcisoft/core/security/JwtAuthenTokenFilter.java
```
  6858d9d1
- 合并 · a3f05b67
  YangZhaoJun1 authored May 21, 2018
  
  a3f05b67
- 导入排课方法更新 · ec84f444
  李博今 authored May 21, 2018
  
  ec84f444
- 导入排课方法更新 · e2111b2f
  李博今 authored May 21, 2018
  
  e2111b2f
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 875dd83c
  李博今 authored May 21, 2018
  
  875dd83c
- 增加排序以及排课导入的新方法（未使用） · fb427873
  李博今 authored May 21, 2018
  
  fb427873
18 May, 2018 2 commits
- 合并分支 · 8641a120
  YangZhaoJun1 authored May 18, 2018
  
  8641a120
- 解决Bug · 8c6408cc
  YangZhaoJun1 authored May 18, 2018
  
  8c6408cc
17 May, 2018 11 commits
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3 · b6f0a937
  YangZhaoJun1 authored May 17, 2018
```
# Conflicts:
#	src/main/java/org/rcisoft/sys/role/dao/SysRoleRepository.java
```
  b6f0a937
- 解决bug · 8fd158d1
  YangZhaoJun1 authored May 17, 2018
  
  8fd158d1
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · d3529fda
  李博今 authored May 17, 2018
  
  d3529fda
- BLesson/queryBLessonsByPagination · 5401980c
  刘子正 authored May 17, 2018
```
lessonName+code

BTeacher/queryBTeachersByPagination
name+code

BStudent/queryBStudentsByPagination
name+code

brooms/queryBRoomsByPagination
classroomName+code

模糊查询条件合并
```
  5401980c
- 增加子任务与子公司的排序显示 · 5dca11ad
  李博今 authored May 17, 2018
  
  5dca11ad
- 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 5 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