Commit Graph

1607 Commits

Author SHA1 Message Date
nisen
fe1a59359d Merge branch 'zcwy0731-llf' into dev0525 2024-08-05 10:58:04 +08:00
zhaolongfei
b85eb97bc1 在线管理资源完成情况名称搜索修复 2024-08-05 10:57:14 +08:00
nisen
6a3cbf290a Merge branch 'zcwy0731-llf' into dev0525 2024-08-05 10:30:56 +08:00
zhaolongfei
28b58a73cf 在线管理资源完成情况名称搜索修复 2024-08-05 10:29:36 +08:00
zhaolongfei
b9adf4c45f 作业多次点击提交报错修复 2024-08-02 17:08:00 +08:00
nisen
65e1e752d0 Merge branch 'zcwy-0724' into dev0525 2024-08-02 13:50:57 +08:00
lu
389dff8fbe 作业导出判空 2024-08-02 13:40:39 +08:00
nisen
ba62bc6403 Merge branch 'zcwy0731-llf' into dev0525 2024-08-02 13:20:15 +08:00
zhaolongfei
49aab74463 作业多次点击提交报错修复 2024-08-02 13:19:08 +08:00
nisen
21e780c589 Merge branch 'zcwy0731-llf' into dev0525 2024-08-02 11:33:37 +08:00
zhaolongfei
9f30910d04 作业多次点击提交报错修复 2024-08-02 11:32:14 +08:00
nisen
89060ad3d9 Merge branch 'zcwy0731-llf' into dev0525 2024-08-02 11:04:20 +08:00
zhaolongfei
6658b8c04b 作业多次点击提交报错修复 2024-08-02 11:03:13 +08:00
nisen
0e7e11b3f1 Merge branch 'zcwy0731-llf' into dev0525
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
2024-08-02 10:18:24 +08:00
zhaolongfei
19df4224a9 作业多次点击提交报错修复 2024-08-02 10:16:05 +08:00
nisen
a13ad69e1f Merge branch 'zcwy0731-llf' into dev0525 2024-08-02 09:37:52 +08:00
zhaolongfei
95ddc9f5d5 作业多次点击提交报错修复 2024-08-02 09:36:36 +08:00
nisen
f3b6bb6fee Merge branch 'zcwy0731-llf' into master-0705
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
2024-08-01 17:43:07 +08:00
nisen
3973cb1421 Merge branch 'zcwy-0724' into dev0525 2024-08-01 16:42:38 +08:00
lu
a9be34631a 作业导出名称修改 2024-08-01 16:30:11 +08:00
nisen
d7d9a3c2c9 Merge branch 'zcwy-0724' into dev0525
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
2024-08-01 15:40:41 +08:00
lu
7e3a3a5838 作业导出名称修改 2024-08-01 15:33:26 +08:00
nisen
b0321d4f28 Merge branch 'zcwy0731-llf' into dev0525
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
2024-07-31 19:03:11 +08:00
zhaolongfei
64965f5ec6 考试管理删除不同步 2024-07-31 19:01:53 +08:00
nisen
21e12c815b 庫名修改 2024-07-31 18:44:49 +08:00
nisen
4e7661530c Merge branch 'zcwy0731-llf' into dev0525
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
2024-07-31 18:40:34 +08:00
zhaolongfei
a407ca2dad 考试管理删除不同步 2024-07-31 18:35:49 +08:00
nisen
cdd6879aee Merge branch 'zcwy0731-llf' into dev0525 2024-07-31 18:14:00 +08:00
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