Commit Graph

1437 Commits

Author SHA1 Message Date
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
joshen
d23bfbe159 Merge branch 'zcwy0618-llf' into 'master'
Zcwy0618 llf

See merge request !111
2024-06-28 18:38:12 +08:00
joshen
17ab1add64 Merge branch 'zcwy0529-l' into 'master'
课程审核时更新发布状态及发布时间

See merge request !110
2024-06-24 17:52:57 +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
zhaolongfei
da6ed5eed4 考试时间修改同步 2024-06-21 14:58:36 +08:00
joshen
13af22baea Merge branch 'zcwy0529-l' into 'dev0525'
审核并发布

See merge request !107
2024-06-21 13:15:42 +08:00
670788339
8cd0624b01 审核并发布 2024-06-21 13:13:50 +08:00
zhaolongfei
f610b0725c Merge branch 'dev0525' of http://10.251.129.121/boeu/java-servers into dev0525 2024-06-21 11:16:45 +08:00
zhaolongfei
805f40f6d6 Merge branch 'zcwy0618-llf' into dev0525
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java
2024-06-21 11:16:25 +08:00
zhaolongfei
b108bc3e76 考试时间修改同步 2024-06-21 11:14:41 +08:00
joshen
cf0667b476 Merge branch 'zcwy0529-l' into 'master'
714课程审核问题

See merge request !106
2024-06-20 17:18:23 +08:00
joshen
e72edb9c77 Merge branch 'zcwy0529-l' into 'dev0525'
714课程审核问题

See merge request !105
2024-06-20 14:13:56 +08:00
670788339
10f630c0b7 714课程审核问题 2024-06-20 14:12:34 +08:00
zhaolongfei
f4d00c7ad4 Merge branch 'zcwy0618-llf' into dev0525 2024-06-19 18:08:57 +08:00
zhaolongfei
1abd059820 修改bug 2024-06-19 18:07:48 +08:00
zhaolongfei
9fb1b432ee Merge branch 'zcwy0606-llf' into dev0525 2024-06-19 16:43:30 +08:00
zhaolongfei
e2c697f860 修改bug 2024-06-19 16:43:08 +08:00
zhaolongfei
d47669b3ea Merge branch 'zcwy0618-llf' into dev0525
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java
2024-06-19 15:50:50 +08:00
zhaolongfei
33fee46433 在线课考试成绩为空问题修改 2024-06-19 15:49:35 +08:00
xiaozhequ
ec8ffcb947 Merge remote-tracking branch 'origin/dev0525' into dev0525 2024-06-19 15:35:45 +08:00
xiaozhequ
105d29b754 Merge branch 'zcwy-0613-wjw' into dev0525 2024-06-19 15:35:18 +08:00
xiaozhequ
de69ba1c11 在线课权限查询 2024-06-19 15:34:53 +08:00
zhaolongfei
a227cb96d2 Merge branch 'dev0525' of http://10.251.129.121/boeu/java-servers into dev0525 2024-06-19 13:56:50 +08:00