Commits · master · 李丛阳 / education

30 Aug, 2019 1 commit

Merge branch 'V2.0.3' into 'master' · 549622b6

xingyuji authored Aug 30, 2019

V2.0.3

将版本分支合入master(此后未开发新版本时，只在master上做修改，保证版本分支代码稳定性)

See merge request !1

549622b6

06 Jun, 2018 2 commits
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 29bf5c11
  李博今 authored Jun 06, 2018
  
  29bf5c11
- 新增删除班级的条件判断 · 78e69e5f
  李博今 authored Jun 06, 2018
  
  78e69e5f
05 Jun, 2018 4 commits
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3 · e8182065
  YangZhaoJun1 authored Jun 05, 2018
  
  e8182065
- 判断非0 -1 · 04af0883
  YangZhaoJun1 authored Jun 05, 2018
  
  04af0883
- 查看周视图具体信息修改 · 02756908
  李博今 authored Jun 05, 2018
  
  02756908
- 新增删除班级条件判定（若此班开课则不可删除） · dd75bb3e
  李博今 authored Jun 05, 2018
  
  dd75bb3e
31 May, 2018 2 commits
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 6c959687
  李博今 authored May 31, 2018
  
  6c959687
- 修改周视图具体信息 · 10d88040
  李博今 authored May 31, 2018
  
  10d88040
30 May, 2018 9 commits
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3 · 79d06b42
  YangZhaoJun1 authored May 30, 2018
  
  79d06b42
- 重新转换ppt接口 · 9cdc52f3
  YangZhaoJun1 authored May 30, 2018
  
  9cdc52f3
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 2fa517a8
  刘子正 authored May 30, 2018
  
  2fa517a8
- 编辑排课接口修改子任务做物理删除 · 73eaeb7a
  刘子正 authored May 30, 2018
  
  73eaeb7a
- 修改周视图具体信息 · be0ebdae
  李博今 authored May 30, 2018
  
  be0ebdae
- 修改周视图 · 7ebd90ed
  李博今 authored May 30, 2018
  
  7ebd90ed
- 修改周视图 · 982c6f0c
  李博今 authored May 30, 2018
  
  982c6f0c
- 班级学生导入更新 · 111cbf12
  李博今 authored May 30, 2018
  
  111cbf12
- 周视图修改 · a77ab585
  李博今 authored May 30, 2018
  
  a77ab585
29 May, 2018 1 commit
- 解决bug · 39fea793
  YangZhaoJun1 authored May 29, 2018
  
  39fea793
28 May, 2018 7 commits
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 88b1a87f
  李博今 authored May 28, 2018
  
  88b1a87f
- 周视图修改 · 1eab11c7
  李博今 authored May 28, 2018
  
  1eab11c7
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3 · deb845f7
  YangZhaoJun1 authored May 28, 2018
  
  deb845f7
- 修改文件复制方法，解决bug · 944c288c
  YangZhaoJun1 authored May 28, 2018
  
  944c288c
- 周视图结构变化，添加新接口，原接口不再使用 · e746c5c6
  李博今 authored May 28, 2018
  
  e746c5c6
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · e08c8366
  李博今 authored May 28, 2018
  
  e08c8366
- 增加导入内部去重 · 250f93a6
  李博今 authored May 28, 2018
  
  250f93a6
25 May, 2018 8 commits
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3 · 92f1bdc7
  YangZhaoJun1 authored May 25, 2018
  
  92f1bdc7
- 隐藏初始化的三个角色 · 95135ad5
  YangZhaoJun1 authored May 25, 2018
  
  95135ad5
- 更新教室 · 125e6b82
  李博今 authored May 25, 2018
  
  125e6b82
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 564c50a0
  李博今 authored May 25, 2018
  
  564c50a0
- 更新教室 · 9dcb0269
  李博今 authored May 25, 2018
  
  9dcb0269
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education into V2.0.3 · baec2605
  YangZhaoJun1 authored May 25, 2018
  
  baec2605
- 解决bug · bd23d78e
  YangZhaoJun1 authored May 25, 2018
  
  bd23d78e
- 更新列表视图合并提示，修改查询bug · 7ede2349
  李博今 authored May 25, 2018
  
  7ede2349
24 May, 2018 6 commits
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · 4a22d5df
  李博今 authored May 24, 2018
  
  4a22d5df
- 修改教室的数据库存储 · 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 into V2.0.3 · d4366537
  YangZhaoJun1 authored May 24, 2018
  
  d4366537
- 解决bug，增加106服务器的配置文件 · f8c322b0
  YangZhaoJun1 authored May 24, 2018
  
  f8c322b0
- Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education · b4b04873
  李博今 authored May 24, 2018
  
  b4b04873