Commit Graph

1579 Commits

Author SHA1 Message Date
nisen
7321f7de6c Merge branch 'zcwy0731-llf' into dev0525 2024-08-09 16:30:53 +08:00
zhaolongfei
7be0acf350 修复在线管理资源完成情况搜索框不能同时搜索问题 2024-08-09 16:29:16 +08:00
zhaolongfei
87892fe8ef 修复在线管理资源完成情况搜索框不能同时搜索问题 2024-08-09 16:27:22 +08:00
zhaolongfei
a0c891cd35 修复在线管理资源完成情况搜索框不能同时搜索问题 2024-08-09 16:24:35 +08:00
nisen
f0fe015561 Merge branch 'zcwy0731-llf' into master-0705 2024-08-06 17:52:08 +08:00
nisen
6e805590b8 Merge branch 'zcwy-0724' into dev0525 2024-08-06 15:49:03 +08:00
nisen
33ebd209ff Merge branch 'zcwy0731-llf' into dev0525 2024-08-06 14:43:26 +08:00
zhaolongfei
91bcec00ef 修复同步到item表没有名称问题 2024-08-06 14:42:05 +08:00
lu
27b863a6a4 作业导出修改名称 2024-08-06 10:43:17 +08:00
nisen
7a210ec701 Merge branch 'zcwy0731-llf' into master-0705 2024-08-05 19:03:09 +08:00
nisen
7569c95241 Merge branch 'zcwy-0724' into dev0525 2024-08-05 18:54:17 +08:00
lu
484a7650dd 导出逻辑 2024-08-05 18:46:29 +08:00
nisen
07d0578edc Merge branch 'zcwy0731-llf' into dev0525 2024-08-05 15:13:33 +08:00
zhaolongfei
6c616a1163 在线课作业重复提交报错修复 2024-08-05 15:12:54 +08:00
nisen
5430c149e1 Merge branch 'zcwy0731-llf' into dev0525 2024-08-05 15:06:23 +08:00
zhaolongfei
939325d5bd 在线课作业重复提交报错修复 2024-08-05 15:05:28 +08:00
nisen
42c953f05a Merge branch 'zcwy-0724' into dev0525 2024-08-05 14:04:09 +08:00
lu
bcb453b2f4 导出判断 2024-08-05 13:57:18 +08:00
nisen
5236f13c14 Merge branch 'zcwy0731-llf' into dev0525 2024-08-05 11:21:53 +08:00
zhaolongfei
4eddbc8e8f 在线管理资源完成情况名称搜索修复 2024-08-05 11:21:14 +08:00
nisen
4e7b4e4a51 Merge branch 'zcwy0731-llf' into dev0525 2024-08-05 11:12:51 +08:00
zhaolongfei
50bdd59a26 在线管理资源完成情况名称搜索修复 2024-08-05 11:11:12 +08:00
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