Commit Graph

803 Commits (644ed9e03f35bc19e477c90cfc346d5cd9e4a5a2)
 

Author SHA1 Message Date
Mlxa0324 903325d63c 课程绑定增加课程标签字段
姚丹ab caf5cc9dac 课程资源
姚丹ab 67160a04ba 课程实操(课程实训)
Mlxa0324 15d3ef6556 1
Mlxa0324 5fb056b574 fix 导出公公方法
Mlxa0324 d3db44ece7 查询开课签到记录
Mlxa0324 97fef951c8 班级
Mlxa0324 8191e9c3a8 班级
Mlxa0324 df5dd59ccf Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev
# Conflicts:
#	web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java
Mlxa0324 c490f514b3 移除开课和学生的关系
Mlxa0324 4c0c81c4c2 移除班级和学生的关系表;
Mlxa0324 a50e6c3a8d 移除开课和学生的关系;
Mlxa0324 417df42728 新增用户时候,判断用户Code唯一
Mlxa0324 469357d1d9 新增院校时候,创建院校管理员用户
Mlxa0324 306c52e443 fix 课程绑定
Mlxa0324 0d418aa2ea Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev
Mlxa0324 e9b2d4bad4 fix 几个模块字段不显示的问题
姚丹ab 0589a17698 Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev
Mlxa0324 f1df0e4630 fix 类型错误
姚丹ab 39e88433ef 课程实操(课程实训)
姚丹ab bb30a464e2 课程实操(课程实训)
Mlxa0324 b3f229a6c0 验证
Mlxa0324 d050e0f20a 验证
Mlxa0324 02f3b2db8b 验证
姚丹ab e556edb2a9 竞赛案例、课程实训
姚丹ab fa4f3037fb 试题管理
Mlxa0324 895c5d340a Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev
Mlxa0324 13cb54810d 增加场次时间字段
姚丹ab 26c032a2f7 修改
Mlxa0324 1f649d1864 验证
Mlxa0324 2cd0f7d0c7 增强IP工具类
Mlxa0324 046a63793a IP区间验证规则修改
姚丹ab 098c423bb1 解决冲突
姚丹ab c210c94799 解决冲突
姚丹ab ee9d3bb328 解决冲突
姚丹ab 551ddc669a 解决冲突
姚丹ab 09240bf5f1 Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev
Mlxa0324 f764b4b4f3 1
Mlxa0324 419e39aa88 Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev
Mlxa0324 3e57fe9d4d 学生签到的验证增强
姚丹ab 44525bd3bf 11
姚丹ab 9159d85d05 11
姚丹ab 994a447ce1 Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev
# Conflicts:
#	web/src/main/resources/static/js/jlw/universityFaculty/index.js
#	web/src/main/resources/static/js/jlw/universitySystem/index.js
#	web/src/main/resources/templates/jlw/schoolClass/add.html
#	web/src/main/resources/templates/jlw/universityFaculty/add.html
#	web/src/main/resources/templates/jlw/universitySystem/add.html
xuliangtong 9cf9dd700e 学生班级专业院系院校修改
姚丹ab ee74764435 课程管理
姚丹ab 060801bdd2 Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev
# Conflicts:
#	web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java
Mlxa0324 0bff01f13f ID类型改Long
姚丹ab 0a2c6dd982 Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev
Mlxa0324 f1fed6e073 字段
Mlxa0324 00f094f380 Beetl工具包扩展