Commits · bfed8a2f77a0b782af118d9c45967cec1cd92969 · 黄奎 / Education

14 Dec, 2020 15 commits
- Merge branch 'master' of http://gitlab.oytour.com/Kui2/education · bfed8a2f
  liudong1993 authored Dec 14, 2020
  
  bfed8a2f
- 解决冲突 · 1bd1d8a6
  liudong1993 authored Dec 14, 2020
  
  1bd1d8a6
- 页面修改 · 81ea41d0
  黄奎 authored Dec 14, 2020
  
  81ea41d0
- 教师奖金 · 43195e67
  liudong1993 authored Dec 14, 2020
  
  43195e67
- 查询修改 · 01426073
  黄奎 authored Dec 14, 2020
  
  01426073
- 新增统计 · 4d2bf3de
  黄奎 authored Dec 14, 2020
  
  4d2bf3de
- Merge branch 'master' of http://gitlab.oytour.com/Kui2/education · 562bfaeb
  吴春 authored Dec 14, 2020
  
  562bfaeb
- 财务基础表信息 · 474c9393
  吴春 authored Dec 14, 2020
  
  474c9393
- 新增字段 · 995f39c7
  黄奎 authored Dec 14, 2020
  
  995f39c7
- 页面修改 · d5890aee
  黄奎 authored Dec 14, 2020
  
  d5890aee
- 新增字段 · 66d3eabd
  黄奎 authored Dec 14, 2020
  
  66d3eabd
- 新增班级配置 · 89ff1153
  黄奎 authored Dec 14, 2020
  
  89ff1153
- 页面修改 · c0bea996
  黄奎 authored Dec 14, 2020
  
  c0bea996
- 解决冲突 · 88cd1d5b
  liudong1993 authored Dec 14, 2020
  
  88cd1d5b
- 教师奖励 · d49a93e3
  liudong1993 authored Dec 14, 2020
  
  d49a93e3
11 Dec, 2020 23 commits
- 提交代码 · bca5cc00
  吴春 authored Dec 11, 2020
  
  bca5cc00
- 页面修改 · 76f8c1a1
  黄奎 authored Dec 11, 2020
  
  76f8c1a1
- 页面修改 · c7b514ac
  黄奎 authored Dec 11, 2020
  
  c7b514ac
- 页面修改 · 86d55c88
  黄奎 authored Dec 11, 2020
  
  86d55c88
- 新增日志 · 68dfe2ac
  黄奎 authored Dec 11, 2020
  
  68dfe2ac
- Merge branch 'master' of http://gitlab.oytour.com/Kui2/education · 492c78a8
  吴春 authored Dec 11, 2020
  
  492c78a8
- 提交代码 · 56b8fe15
  吴春 authored Dec 11, 2020
  
  56b8fe15
- 页面修改 · b7f2193e
  黄奎 authored Dec 11, 2020
  
  b7f2193e
- 页面修改 · 55b4efb4
  黄奎 authored Dec 11, 2020
  
  55b4efb4
- 新增功能权限验证 · 4d875969
  黄奎 authored Dec 11, 2020
  
  4d875969
- Merge branch 'master' of http://gitlab.oytour.com/Kui2/education · 58053a1f
  liudong1993 authored Dec 11, 2020
  
  58053a1f
- bug调整 · 1c60403d
  liudong1993 authored Dec 11, 2020
  
  1c60403d
- 页面修改 · 045df8ef
  黄奎 authored Dec 11, 2020
  
  045df8ef
- 页面修改 · dea08b7b
  黄奎 authored Dec 11, 2020
  
  dea08b7b
- 页面修改 · c1f814e4
  黄奎 authored Dec 11, 2020
  
  c1f814e4
- 提交代码 · ea4c8736
  吴春 authored Dec 11, 2020
  
  ea4c8736
- 日语培训查询 · 54986e97
  liudong1993 authored Dec 11, 2020
  
  54986e97
- Merge branch 'master' of http://gitlab.oytour.com/Kui2/education · 478ce603
  liudong1993 authored Dec 11, 2020
  
  478ce603
- 日语培训调整 · 3158a807
  liudong1993 authored Dec 11, 2020
  
  3158a807
- Merge branch 'master' of http://gitlab.oytour.com/Kui2/education · 30c0b3ac
  吴春 authored Dec 11, 2020
```
# Conflicts:
#	Edu.Module.Course/ClassModule.cs
```
  30c0b3ac
- 提交代码 · a08a7b87
  吴春 authored Dec 11, 2020
  
  a08a7b87
- Merge branch 'master' of http://gitlab.oytour.com/Kui2/education · 4a69f56a
  liudong1993 authored Dec 11, 2020
  
  4a69f56a
- 教务奖励配置 · ae111b23
  liudong1993 authored Dec 11, 2020
  
  ae111b23
10 Dec, 2020 2 commits
- 页面修改 · 841c9b8d
  黄奎 authored Dec 10, 2020
  
  841c9b8d
- 页面修改 · 3a77287a
  黄奎 authored Dec 10, 2020
  
  3a77287a