zhaolongfei
|
7a9859cf9c
|
考试管理删除不同步
|
2024-07-31 18:07:38 +08:00 |
|
nisen
|
eb70c7a985
|
Merge branch 'zcwy-0724' into dev0525
|
2024-07-31 17:53:18 +08:00 |
|
lu
|
f79a159e22
|
作业导出增加返回值
|
2024-07-31 17:48:29 +08:00 |
|
nisen
|
0556fce863
|
Merge branch 'zcwy0731-llf' into dev0525
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
|
2024-07-31 17:44:33 +08:00 |
|
zhaolongfei
|
becebadfe0
|
考试管理删除不同步
|
2024-07-31 17:41:56 +08:00 |
|
nisen
|
2a78c13abb
|
Merge branch 'zcwy-0724' into dev0525
|
2024-07-31 17:03:10 +08:00 |
|
lu
|
b9c4503aaa
|
作业导出判空
|
2024-07-31 16:55:01 +08:00 |
|
nisen
|
50745e8398
|
Merge branch 'zcwy-0724' into dev0525
|
2024-07-31 12:27:53 +08:00 |
|
lu
|
860fb3f27c
|
提交作业路径修改
|
2024-07-31 11:55:01 +08:00 |
|
nisen
|
036df70e83
|
Merge branch 'zcwy-0724' into dev0525
|
2024-07-31 10:59:52 +08:00 |
|
lu
|
294949f4e5
|
提交作业bug
|
2024-07-31 10:03:46 +08:00 |
|
nisen
|
16f1c2337b
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-30 15:46:41 +08:00 |
|
nisen
|
55b35db9a9
|
Merge branch 'zcwy-0724' into dev0525
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java
|
2024-07-30 15:35:47 +08:00 |
|
lu
|
9b8487b0ca
|
作业导出
|
2024-07-30 15:26:39 +08:00 |
|
nisen
|
2f1983d76b
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-30 14:06:11 +08:00 |
|
zhaolongfei
|
bf476a23a0
|
在线管理状态完成情况
|
2024-07-30 14:05:06 +08:00 |
|
nisen
|
c607d35281
|
Merge branch 'zcwy-0724' into dev0525
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java
|
2024-07-30 12:23:55 +08:00 |
|
nisen
|
0f0edaf2cd
|
Merge branch 'zcwy0729-llf' into master-0705
|
2024-07-30 11:56:45 +08:00 |
|
lu
|
e508551043
|
作业导出bug
|
2024-07-30 11:53:53 +08:00 |
|
nisen
|
f6e5d7539d
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-30 11:06:11 +08:00 |
|
nisen
|
68d00e8c51
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-29 19:56:17 +08:00 |
|
zhaolongfei
|
41a542ea23
|
Merge remote-tracking branch 'java-servse-yx/zcwy0606-llf' into zcwy0729-llf
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java
# servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java
|
2024-07-29 19:52:50 +08:00 |
|
nisen
|
83e71dc5d6
|
Merge branch 'zcwy0716-llf' into yxmaster
|
2024-07-29 19:47:41 +08:00 |
|
zhaolongfei
|
fc98025a3a
|
视频暂存为空判断
|
2024-07-29 19:21:26 +08:00 |
|
zhaolongfei
|
687cd24de3
|
在线管理资源完成情况修改
|
2024-07-29 09:34:40 +08:00 |
|
nisen
|
f5f53557b6
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 22:21:06 +08:00 |
|
zhaolongfei
|
4687b353eb
|
在线管理资源完成情况修改
|
2024-07-26 22:19:59 +08:00 |
|
nisen
|
4b4f30b412
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 22:16:40 +08:00 |
|
zhaolongfei
|
072ee25037
|
在线管理资源完成情况修改
|
2024-07-26 22:15:44 +08:00 |
|
nisen
|
6f19ff7b0f
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 22:11:30 +08:00 |
|
zhaolongfei
|
2f8163b0a3
|
在线管理资源完成情况修改
|
2024-07-26 22:10:47 +08:00 |
|
nisen
|
f8566d2321
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 22:06:19 +08:00 |
|
zhaolongfei
|
5890f1b800
|
在线管理资源完成情况修改
|
2024-07-26 22:04:37 +08:00 |
|
nisen
|
d6102d1ce1
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 21:52:10 +08:00 |
|
zhaolongfei
|
50942a9435
|
在线管理资源完成情况修改
|
2024-07-26 21:50:40 +08:00 |
|
nisen
|
6521464676
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 21:38:42 +08:00 |
|
zhaolongfei
|
3ec7f587b3
|
在线管理资源完成情况修改
|
2024-07-26 21:36:23 +08:00 |
|
nisen
|
b6378b6565
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 21:20:05 +08:00 |
|
zhaolongfei
|
885b203dd6
|
在线管理资源完成情况修改
|
2024-07-26 21:17:35 +08:00 |
|
nisen
|
66d7f2a3cf
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 20:53:21 +08:00 |
|
zhaolongfei
|
e6f4affa21
|
在线管理资源完成情况修改
|
2024-07-26 20:51:55 +08:00 |
|
nisen
|
faea4f8b2a
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 20:37:09 +08:00 |
|
zhaolongfei
|
e4f845fdde
|
在线管理资源完成情况修改
|
2024-07-26 20:36:28 +08:00 |
|
nisen
|
c203956bc6
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 20:25:00 +08:00 |
|
zhaolongfei
|
c97cd3daab
|
在线管理资源完成情况修改
|
2024-07-26 20:24:17 +08:00 |
|
nisen
|
cf4004f073
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 19:00:39 +08:00 |
|
zhaolongfei
|
74f37b008d
|
在线管理资源完成情况修改
|
2024-07-26 19:00:14 +08:00 |
|
nisen
|
6bf5ccbcec
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 18:59:20 +08:00 |
|
zhaolongfei
|
d0b1894c14
|
在线管理资源完成情况修改
|
2024-07-26 18:58:35 +08:00 |
|
nisen
|
63867db58e
|
Merge branch 'zcwy0716-llf' into master-0705
|
2024-07-26 18:45:50 +08:00 |
|