1256 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zhaolongfei	cceccab48e	学员在线删除失败的bug修复	2024-06-03 15:25:29 +08:00
zhaolongfei	b595800344	Merge branch 'zcwy0525-llf' into dev0525	2024-06-03 14:40:50 +08:00
zhaolongfei	b9143eacf6	学员在线删除失败的bug修复	2024-06-03 14:34:06 +08:00
zhaolongfei	d1bff77f1f	配置文件回退	2024-05-30 09:05:55 +08:00
670788339	ac931216aa	配置文件	2024-05-29 18:17:12 +08:00
670788339	aad54ee66f	配置文件	2024-05-29 17:59:07 +08:00
joshen	7521f350f0	Merge branch 'zcwy0525-llf' into 'master' ... Zcwy0525 llf See merge request !103	2024-05-29 17:47:49 +08:00
zhaolongfei	85eb11c30a	Merge branch 'zcwy0525-llf' into dev0525 ... # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java	2024-05-29 11:31:16 +08:00
zhaolongfei	8791256413	修改	2024-05-29 11:29:49 +08:00
zhaolongfei	309a6732bc	修改	2024-05-29 11:28:38 +08:00
zhaolongfei	5f223d9183	Merge branch 'zcwy0525-llf' into dev0525 ... # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyAssessApi.java # servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java # servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java	2024-05-29 11:25:40 +08:00
zhaolongfei	0f882deca9	修改	2024-05-29 10:01:05 +08:00
zhaolongfei	b74141a036	修改	2024-05-29 09:58:28 +08:00
joshen	8b499d4df8	Merge branch 'zcwy0529-l' into 'master' ... 及格线 See merge request !102	2024-05-28 20:11:35 +08:00
670788339	bf8dd3412e	及格线	2024-05-28 20:10:53 +08:00
joshen	d0f62c6a0c	Merge branch 'zcwy0529-l' into 'master' ... 测试 See merge request !101	2024-05-28 20:02:55 +08:00
670788339	011d61f932	测试	2024-05-28 19:59:57 +08:00
zhaolongfei	a090325202	修改	2024-05-28 19:58:44 +08:00
zhaolongfei	c7841adcaa	修改考试	2024-05-28 19:49:43 +08:00
670788339	2650e96a47	在线课	2024-05-28 19:48:19 +08:00
zhaolongfei	9f0a926841	修改评估	2024-05-28 19:30:35 +08:00
zhaolongfei	dc3e47ec15	修改评估	2024-05-28 19:21:24 +08:00
joshen	b8ba423da1	Merge branch 'zcwy0528-l' into 'master' ... 680在线课未设置及格线时考试无法提交的问题 See merge request !100	2024-05-28 19:16:57 +08:00
zhaolongfei	3acf58e8d4	修改评估	2024-05-28 19:12:51 +08:00
zhaolongfei	2ff595062c	修改考试	2024-05-28 18:55:00 +08:00
zhaolongfei	0b3c6b057e	Merge branch 'zcwy0525-llf' into dev0525	2024-05-28 18:47:19 +08:00
zhaolongfei	36fd3628bb	修改考试	2024-05-28 18:46:43 +08:00
zhaolongfei	56866a51df	修改考试	2024-05-28 18:45:35 +08:00
zhaolongfei	c1e45afbca	Merge branch 'zcwy0525-llf' into dev0525	2024-05-28 18:30:38 +08:00
zhaolongfei	33b0057c5e	修改考试	2024-05-28 18:28:08 +08:00
zhaolongfei	219b406e8a	Merge branch 'zcwy0525-llf' into dev0525 ... # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java	2024-05-28 18:14:51 +08:00
zhaolongfei	de0ff38302	修改考试	2024-05-28 18:13:54 +08:00
zhaolongfei	06d14582cc	修改考试	2024-05-28 18:12:46 +08:00
zhaolongfei	08763593cd	修改考试	2024-05-28 17:41:07 +08:00
zhaolongfei	5f1f3ebf9f	Merge branch 'zcwy0525-llf' into dev0525	2024-05-28 16:28:51 +08:00
zhaolongfei	8c283bc976	考试添加状态同步	2024-05-28 16:27:48 +08:00
zhaolongfei	c66c6369c6	配置文件修改	2024-05-28 16:11:18 +08:00
zhaolongfei	402015f5b1	配置文件修改	2024-05-28 15:49:13 +08:00
zhaolongfei	f61c7ed83f	Merge branch 'zcwy0525-llf' into dev0525 ... # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java # servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java # servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java # servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java	2024-05-28 15:41:32 +08:00
zhaolongfei	3803babc76	修改	2024-05-28 15:37:37 +08:00
zhaolongfei	8e3231b506	Merge branch 'dev0525' of http://10.251.129.121/boeu/java-servers into dev0525	2024-05-28 15:10:51 +08:00
zhaolongfei	1c3a70bc12	修改	2024-05-28 15:10:33 +08:00
670788339	a62c39b13c	136	2024-05-28 14:16:51 +08:00
670788339	0c5b8c3a74	680在线课未设置及格线时考试无法提交的问题	2024-05-28 09:49:48 +08:00
joshen	e71c18dafe	Merge branch 'zcwy0525-llf' into 'master' ... 修改进度同步执行顺序 See merge request !99	2024-05-27 11:16:21 +08:00
zhaolongfei	189a47d4d0	Merge branch 'zcwy0525-llf' into dev0525 ... # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java	2024-05-27 09:15:58 +08:00
670788339	566146e670	修改进度同步执行顺序	2024-05-27 08:59:03 +08:00
joshen	990b27d3ef	Merge branch 'zcwy0525-llf' into 'master' ... Zcwy0525 llf See merge request !98	2024-05-25 19:27:04 +08:00
zhaolongfei	0c98dbef06	Merge branch 'zcwy0525-llf' into dev0525 ... # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java # servers/boe-server-all/src/main/resources/application.properties	2024-05-25 19:09:23 +08:00
zhaolongfei	73c2e8b54a	修改测试查询参数	2024-05-25 19:05:35 +08:00