Commit Graph

3041 Commits

Author SHA1 Message Date
sunhonglai
8497deea52 增加日志打印 2025-04-18 09:27:01 +08:00
joshen
39063bb37e Merge branch '250415-bugfix-shl' into test20250220 2025-04-18 08:59:45 +08:00
sunhonglai
8746904cb9 学习时长上报接口合并 2025-04-18 08:51:48 +08:00
joshen
5d458c97da Merge branch '250415-bugfix-shl' into test20250220
# Conflicts:
#	src/views/study/coursenew.vue
2025-04-16 14:07:54 +08:00
sunhonglai
213e5abce3 去掉无用注释影响后绪修改逻辑 2025-04-16 14:01:43 +08:00
sunhonglai
dc7f942303 先修改对应的后端接口 2025-04-16 10:19:56 +08:00
sunhonglai
4c1c370879 清除无用注释,影响排查要搜索修改的代码 2025-04-16 08:51:10 +08:00
joshen
30224553c9 Merge branch '250415-bugfix-shl' into test20250220 2025-04-15 16:26:08 +08:00
sunhonglai
ffbc4ef808 增加乐享强制走sso 2025-04-15 16:20:23 +08:00
joshen
34ab4e5319 Merge branch '250415-bugfix-shl' into test20250220 2025-04-15 09:14:19 +08:00
sunhonglai
5936183912 增加乐享转向 2025-04-15 09:12:11 +08:00
joshen
4df875d891 部署生产1 2025-04-14 14:45:50 +08:00
joshen
205fcac1f4 部署生产1 2025-04-14 14:42:51 +08:00
joshen
084fcec0c4 部署生产1 2025-04-14 14:37:29 +08:00
joshen
3ff5b9989c Merge branch 'master-20250403-lyc' into test20250220 2025-04-09 14:31:45 +08:00
sunhonglai
702881c100 修改排行榜展示数据不对问题 2025-04-09 14:28:42 +08:00
joshen
edd45a8e78 Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 16:37:13 +08:00
670788339
b0229f6cde 测试 2025-04-03 16:36:38 +08:00
joshen
5b33403db2 Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 16:34:16 +08:00
670788339
9c6c1708fc 测试 2025-04-03 16:33:42 +08:00
joshen
93fb9157e1 Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 16:25:18 +08:00
670788339
b67d7f4311 测试 2025-04-03 16:24:13 +08:00
joshen
aff28e9ec7 Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 16:18:13 +08:00
670788339
c5e54f0170 测试 2025-04-03 16:17:04 +08:00
joshen
5eebcf58c5 Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 15:30:38 +08:00
joshen
e45f701138 Merge remote-tracking branch '121-git/test20250220' into test20250220 2025-04-03 15:24:04 +08:00
joshen
fab62c4f7f Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220 2025-04-03 15:23:44 +08:00
670788339
5c5a71ec55 测试 2025-04-03 15:21:51 +08:00
joshen
b6a3a32412 Merge remote-tracking branch 'aliyun/master_20250319-lyc' 2025-04-02 16:59:49 +08:00
joshen
479a3327f0 Merge branch '250331-bugfix-shl' into test20250220 2025-04-01 09:19:46 +08:00
sunhonglai
d6fd44830b 去掉无用日志 2025-04-01 08:30:37 +08:00
sunhonglai
d01fd6f07b 修改视频播放拖拽问题 2025-03-31 19:13:55 +08:00
joshen
535681749c Merge remote-tracking branch 'yx/master_20250319-lyc' into test20250220 2025-03-28 13:20:26 +08:00
670788339
f9e332ab7c SZX-1045 2025-03-28 11:47:43 +08:00
joshen
da481c72c5 Merge branch '250321-bugfix-shl' into test20250220 2025-03-24 10:21:57 +08:00
sunhonglai
0989360183 Merge remote-tracking branch 'origin/250321-bugfix-shl' into 250321-bugfix-shl
# Conflicts:
#	src/views/Login.vue
2025-03-24 08:31:59 +08:00
sunhonglai
5e31f7d1a8 注掉废弃的登录页面 2025-03-24 08:31:27 +08:00
sunhonglai
eaa7f04cd6 删除废弃的登录页面 2025-03-21 16:52:47 +08:00
sunhonglai
0d7a2ad353 修改响应结果空指针问题 2025-03-21 15:48:40 +08:00
joshen
374dfb6b3d Merge branch 'master_20250319-lyc' into test20250220
# Conflicts:
#	src/views/portal/case/Index.vue
2025-03-19 13:35:37 +08:00
670788339
9d9d663591 课程详情显示供应商 2025-03-19 13:31:50 +08:00
joshen
d212938819 Merge branch '250220-pre-126-177-gx' into test20250220 2025-03-19 09:22:53 +08:00
gengxin
14220b6d4d 考试整理1 2025-03-19 09:21:36 +08:00
joshen
bbaa86ff92 Merge branch '250220-pre-126-177-gx' into test20250220 2025-03-19 08:51:24 +08:00
gengxin
2a2cb22fe9 考试整理 2025-03-19 08:49:45 +08:00
joshen
90b53a54b2 Merge branch '250220-pre-126-177-gx' into master_1202 2025-03-13 17:38:58 +08:00
gengxin
b89a8266e5 考试完成判断3 2025-03-13 17:37:33 +08:00
joshen
49137387f6 Merge branch '250220-pre-126-177-gx' into master_1202 2025-03-13 17:16:32 +08:00
joshen
94c82417a2 Merge branch '250220-pre-126-177-gx' into test20250220 2025-03-13 16:39:31 +08:00
gengxin
812c09d65c 考试完成判断 2025-03-13 16:38:33 +08:00