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 |
|
xiaozhequ
|
0b0bd748d9
|
新在线课逻辑
|
2024-07-02 09:42:47 +08:00 |
|
xiaozhequ
|
9fd4171107
|
新在线课逻辑
|
2024-07-02 08:56:28 +08:00 |
|
yang
|
2ebb945198
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
|
2024-07-01 11:14:36 +08:00 |
|
yang
|
de7d26f447
|
成长路径图,考试绑定
|
2024-07-01 11:14:04 +08:00 |
|
yang
|
a6b9fb8da2
|
Merge remote-tracking branch 'origin/dev0525' into dev0525
|
2024-07-01 10:38:31 +08:00 |
|
yang
|
8868d3771b
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java
|
2024-07-01 10:37:37 +08:00 |
|
yang
|
e2e0aeb9cb
|
成长路径图,考试绑定
|
2024-07-01 10:36:06 +08:00 |
|
xiaozhequ
|
2fb3cf28e6
|
Merge branch 'zcwy-0613-wjw' into dev0525
|
2024-06-24 16:02:21 +08:00 |
|
xiaozhequ
|
625c41f466
|
在线可权限bug
|
2024-06-24 16:00:23 +08:00 |
|
joshen
|
340091b916
|
Merge branch 'zcwy0529-l' into 'dev0525'
课程审核时更新发布状态及发布时间
See merge request !109
|
2024-06-24 15:04:03 +08:00 |
|
xiaozhequ
|
f1a92fd371
|
Merge branch 'zcwy-0613-wjw' into dev0525
|
2024-06-24 14:58:43 +08:00 |
|
xiaozhequ
|
f950788e08
|
课程权限学习路径图保持一致
|
2024-06-24 14:58:13 +08:00 |
|
xiaozhequ
|
b934c71e3a
|
Merge branch 'zcwy-0613-wjw' into dev0525
|
2024-06-24 14:08:02 +08:00 |
|
670788339
|
7c9c1987a3
|
课程审核时更新发布状态及发布时间
|
2024-06-24 14:05:34 +08:00 |
|
xiaozhequ
|
a26ceb86d1
|
学习路径图保持一致
|
2024-06-24 14:04:53 +08:00 |
|
xiaozhequ
|
7217348ae9
|
Merge branch 'zcwy-0613-wjw' into dev0525
|
2024-06-24 13:48:54 +08:00 |
|
xiaozhequ
|
a2317d0b59
|
在线可权限更改逻辑
|
2024-06-24 13:47:34 +08:00 |
|
yang
|
3d5c9620f7
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
|
2024-06-23 22:21:46 +08:00 |
|
yang
|
bcdc784e7d
|
成长路径图,保存考试信息
|
2024-06-23 22:03:07 +08:00 |
|
yang
|
21b990898d
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
|
2024-06-23 17:56:17 +08:00 |
|
yang
|
7c4a6feb78
|
成长路径图,保存考试信息
|
2024-06-23 17:56:03 +08:00 |
|
yang
|
77c8991d13
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
|
2024-06-22 11:31:14 +08:00 |
|
yang
|
aa245e52c6
|
成长路径图,保存考试信息
|
2024-06-22 11:29:22 +08:00 |
|
joshen
|
0be67ca01c
|
Merge branch 'zcwy0529-l' into 'master'
审核并发布
See merge request !108
|
2024-06-21 17:25:04 +08:00 |
|
xiaozhequ
|
43950ccff3
|
Merge branch 'zcwy-0613-wjw' into dev0525
|
2024-06-21 15:48:06 +08:00 |
|
xiaozhequ
|
53c38baf22
|
修复查询失败bug
|
2024-06-21 15:46:43 +08:00 |
|
zhaolongfei
|
83458c030b
|
Merge branch 'zcwy0618-llf' into dev0525
|
2024-06-21 14:59:14 +08:00 |
|