1385 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
yang	d0944b05e0	Merge branch 'refs/heads/zcwy0622-yang' into dev0525 ... # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java # servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java # servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java # servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java	2024-07-08 11:18:32 +08:00
yang	e144fde444	成长路径图，考试实时同步	2024-07-08 11:12:57 +08:00
joshen	7b2217c017	Merge branch 'zcwy0618-llf' into 'master' ... Zcwy0618 llf See merge request !112	2024-07-05 17:48:02 +08:00
zhaolongfei	0cdbdfbb30	Merge branch 'zcwy0618-llf' into dev0525	2024-07-05 15:19:01 +08:00
zhaolongfei	333f29f008	在线课考试分数状态问题修改	2024-07-05 15:17:38 +08:00
zhaolongfei	439737f9a5	Merge branch 'zcwy0704-llf' into dev0525	2024-07-05 09:19:16 +08:00
zhaolongfei	88158e7ebf	创建在线课时的问题修改	2024-07-05 09:17:06 +08:00
zhaolongfei	4e870985a8	Merge branch 'zcwy0704-llf' into dev0525 ... # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java # servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java	2024-07-04 20:19:31 +08:00
zhaolongfei	973afb94b4	成长路径考试同步	2024-07-04 20:16:04 +08:00
xiaozhequ	da566414eb	Merge branch 'zcwy-0613-wjw' into dev0525	2024-07-04 16:22:57 +08:00
xiaozhequ	407c7693bb	区分新建课	2024-07-04 16:21:48 +08:00
zhaolongfei	e69ab94c8c	Merge branch 'zcwy0704-llf' into dev0525	2024-07-04 15:40:31 +08:00
zhaolongfei	9aa852e56f	优化在线课时长添加	2024-07-04 15:40:08 +08:00
zhaolongfei	42040f023d	Merge branch 'zcwy0704-llf' into dev0525	2024-07-04 15:37:47 +08:00
zhaolongfei	e7b6d08802	在线课时长添加	2024-07-04 15:36:43 +08:00
zhaolongfei	ddf846fe2f	Merge branch 'zcwy0704-llf' into dev0525	2024-07-04 15:20:02 +08:00
zhaolongfei	ebaf8e09d3	在线课时长添加	2024-07-04 15:18:39 +08:00
zhaolongfei	1f2a07efb3	Merge branch 'zcwy0704-llf' into dev0525	2024-07-04 15:12:00 +08:00
zhaolongfei	cdccb6f0ef	在线课时长添加	2024-07-04 15:11:23 +08:00
xiaozhequ	4c1c19c364	Merge branch 'zcwy-0613-wjw' into dev0525	2024-07-04 15:07:09 +08:00
xiaozhequ	564bf42464	hrbp只读权限	2024-07-04 15:06:42 +08:00
zhaolongfei	f6e167e024	Merge branch 'zcwy0704-llf' into dev0525	2024-07-04 14:53:32 +08:00
zhaolongfei	7287c6d7b8	在线课时长添加	2024-07-04 14:52:29 +08:00
zhaolongfei	6749aaa594	Merge branch 'zcwy0704-llf' into dev0525	2024-07-04 14:43:08 +08:00
zhaolongfei	ac552d5452	在线课时长添加	2024-07-04 14:42:20 +08:00
zhaolongfei	c9dbc8a622	Merge branch 'zcwy0704-llf' into dev0525	2024-07-04 14:23:05 +08:00
zhaolongfei	559f525450	在线课时长添加	2024-07-04 14:22:08 +08:00
xiaozhequ	7e2b3506c6	Merge branch 'zcwy-0613-wjw' into dev0525	2024-07-04 12:33:49 +08:00
xiaozhequ	55717e4dde	删除筛选	2024-07-04 12:33:35 +08:00
xiaozhequ	2698061eae	更改实体类字段	2024-07-04 12:32:44 +08:00
xiaozhequ	7aa30aff77	Merge branch 'zcwy-0613-wjw' into dev0525	2024-07-04 10:55:30 +08:00
xiaozhequ	eb401d8fdf	新在线课逻辑	2024-07-04 10:55:17 +08:00
xiaozhequ	d2f323bb38	Merge branch 'zcwy-0613-wjw' into dev0525	2024-07-04 10:31:44 +08:00
xiaozhequ	20374e274a	新在线课逻辑修复bug	2024-07-04 10:31:28 +08:00
xiaozhequ	e57a02bf87	Merge remote-tracking branch 'origin/dev0525' into dev0525	2024-07-04 10:05:22 +08:00
xiaozhequ	2b63fe1db6	Merge branch 'zcwy-0613-wjw' into dev0525	2024-07-04 09:50:16 +08:00
xiaozhequ	c7a39a1f22	新在线课修复bug	2024-07-04 09:49:49 +08:00
zhaolongfei	49f920e730	Merge branch 'zcwy0618-llf' into dev0525	2024-07-03 17:44:01 +08:00
zhaolongfei	ba6cca93b3	在线课考试成绩状态文提修改	2024-07-03 17:43:14 +08:00
xiaozhequ	8d3eed6603	Merge branch 'zcwy-0613-wjw' into dev0525	2024-07-03 16:30:45 +08:00
xiaozhequ	7eb578127d	新在线课逻辑优化2	2024-07-03 16:30:19 +08:00
xiaozhequ	2adb039a82	Merge branch 'zcwy-0613-wjw' into dev0525	2024-07-03 12:47:07 +08:00
xiaozhequ	f2be349301	新在线课逻辑优化	2024-07-03 12:46:55 +08:00
xiaozhequ	5bd71c539b	Merge remote-tracking branch 'origin/dev0525' into dev0525	2024-07-03 09:59:08 +08:00
xiaozhequ	332aa68960	Merge branch 'zcwy-0613-wjw' into dev0525	2024-07-03 09:58:27 +08:00
xiaozhequ	e0037b8814	课程权限优化	2024-07-03 09:57:59 +08:00
yang	4fdd7b1352	Merge remote-tracking branch 'origin/dev0525' into dev0525	2024-07-03 09:02:33 +08:00
yang	cb7bedf353	Merge branch 'refs/heads/zcwy0622-yang' into dev0525	2024-07-03 09:02:12 +08:00
yang	a4f260b99a	成长路径图，考试	2024-07-03 09:01:53 +08:00
xiaozhequ	745e2299e5	Merge branch 'zcwy-0613-wjw' into dev0525	2024-07-02 09:48:09 +08:00