 yangws
|
e36ede941c
|
Merge remote-tracking branch 'origin/main' into yangws
|
2024-09-23 09:32:35 +08:00 |
|
yangws
|
87a50c397f
|
fix:2.0.4bug修改;
|
2024-09-23 09:20:19 +08:00 |
 朱浩
|
27c7033522
|
Merge pull request 'yangws' (#249) from yangws into main
Reviewed-on: #249
|
2024-09-22 16:47:12 +08:00 |
|
朱浩
|
4c66cc90c0
|
BUG修复
|
2024-09-22 16:46:37 +08:00 |
 lyc
|
c2b54714ac
|
Merge pull request '跳转增加bookid' (#248) from lyc-dev into main
|
2024-09-22 16:41:45 +08:00 |
|
lyc
|
cafea2d719
|
跳转增加bookid
|
2024-09-22 16:41:49 +08:00 |
|
yangws
|
d5afede36c
|
fix:2.0.4bug修改;
|
2024-09-22 16:28:10 +08:00 |
|
朱浩
|
03e61c8440
|
Merge pull request '打包联通文枢课堂' (#247) from zhuhao_dev into main
Reviewed-on: #247
|
2024-09-22 14:28:29 +08:00 |
|
朱浩
|
79b9a0726a
|
打包联通文枢课堂
|
2024-09-22 14:27:48 +08:00 |
|
朱浩
|
0ccde18f00
|
Merge pull request 'zhuhao_dev' (#246) from zhuhao_dev into main
Reviewed-on: #246
|
2024-09-22 14:02:32 +08:00 |
|
朱浩
|
274c80ad0a
|
Merge branch 'main' into zhuhao_dev
|
2024-09-22 14:02:02 +08:00 |
|
yangws
|
923006eab1
|
Merge pull request 'fix:2.0.4bug修改;' (#245) from yangws into main
Reviewed-on: #245
|
2024-09-22 12:52:53 +08:00 |
|
yangws
|
a64ba24742
|
fix:2.0.4bug修改;
|
2024-09-22 12:51:58 +08:00 |
|
lyc
|
df1f8737bd
|
Merge pull request '点击章节 存储章节id （临时）' (#244) from lyc-dev into main
|
2024-09-22 12:34:16 +08:00 |
|
lyc
|
19a3b948c5
|
点击章节 存储章节id （临时）
|
2024-09-22 12:34:15 +08:00 |
|
朱浩
|
622cdfe0fe
|
BUG修复 #811,V2.0.3 APT设计-添加活动，与当前选择的章节不一致
|
2024-09-22 11:14:19 +08:00 |
|
朱浩
|
78b795bf4f
|
BUG修复 #801,V2.0.3 教学实践-作业，红框部分去掉
|
2024-09-22 10:53:23 +08:00 |
|
lyc
|
92667a7d25
|
Merge pull request '注册账号-班级修改为可选' (#243) from lyc-dev into main
|
2024-09-22 10:38:38 +08:00 |
|
lyc
|
71f7e4e5a1
|
注册账号-班级修改为可选
|
2024-09-22 10:38:31 +08:00 |
|
朱浩
|
3cced30959
|
Merge branch 'main' into zhuhao_dev
|
2024-09-20 16:56:44 +08:00 |
|
朱浩
|
ef9fe838a3
|
BUG修复
|
2024-09-20 16:56:26 +08:00 |
 zhangxuelin
|
9ff824e082
|
Merge pull request '修改工具拖动' (#242) from zdg into main
Reviewed-on: #242
|
2024-09-20 16:27:54 +08:00 |
|
zhangxuelin
|
8975784ce0
|
修改工具拖动
|
2024-09-20 16:27:12 +08:00 |
|
lyc
|
e586755b75
|
Merge pull request 'edit' (#241) from lyc-dev into main
|
2024-09-20 15:38:39 +08:00 |
|
lyc
|
ef771f4e0b
|
edit
|
2024-09-20 15:38:37 +08:00 |
|
朱浩
|
049768c8b6
|
Merge pull request 'BUG修复' (#240) from zhuhao_dev into main
Reviewed-on: #240
|
2024-09-20 15:29:56 +08:00 |
|
朱浩
|
ac599a2c39
|
BUG修复
|
2024-09-20 15:29:21 +08:00 |
|
lyc
|
00871797bf
|
edit
|
2024-09-20 15:24:23 +08:00 |
|
lyc
|
fa7a44472b
|
Merge pull request 'edit' (#239) from lyc-dev into main
|
2024-09-20 15:24:19 +08:00 |
|
lyc
|
85529ad81f
|
Merge pull request 'edit' (#238) from lyc-dev into main
|
2024-09-20 15:20:27 +08:00 |
|
lyc
|
f9a87143aa
|
edit
|
2024-09-20 15:19:33 +08:00 |
 zhengdegang
|
17ef183741
|
Merge pull request 'zdg' (#237) from zdg into main
Reviewed-on: #237
|
2024-09-20 15:17:16 +08:00 |
zdg
|
d5833f6f03
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-20 15:16:43 +08:00 |
|
zdg
|
c93eeeb308
|
修复异常
|
2024-09-20 15:16:34 +08:00 |
|
zhengdegang
|
0d48111e50
|
Merge pull request '解决 值为null问题' (#236) from zdg into main
Reviewed-on: #236
|
2024-09-20 15:06:33 +08:00 |
|
zdg
|
ca57e72e9c
|
解决 值为null问题
|
2024-09-20 15:04:14 +08:00 |
|
zhengdegang
|
928a1401db
|
Merge pull request 'zdg' (#235) from zdg into main
Reviewed-on: #235
|
2024-09-20 14:57:41 +08:00 |
|
zdg
|
e0d3a6da6a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-20 14:56:54 +08:00 |
|
zdg
|
1a9b426ec3
|
修复-上课 提示
|
2024-09-20 14:56:48 +08:00 |
|
lyc
|
d4cfedf883
|
Merge pull request 'lyc-dev' (#234) from lyc-dev into main
|
2024-09-20 14:43:21 +08:00 |
|
lyc
|
b5fd1f2a9d
|
edit
|
2024-09-20 14:42:58 +08:00 |
|
lyc
|
c6477d5ca9
|
edit
|
2024-09-20 14:34:22 +08:00 |
|
lyc
|
27ec047981
|
edit 教材选择
|
2024-09-20 14:30:36 +08:00 |
|
zhengdegang
|
7da4defed4
|
Merge pull request 'zdg' (#233) from zdg into main
Reviewed-on: #233
|
2024-09-20 13:54:51 +08:00 |
|
zdg
|
51cb1989a1
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-20 13:53:53 +08:00 |
|
zdg
|
4ab4d5dff2
|
恢复修改
|
2024-09-20 13:53:42 +08:00 |
|
lyc
|
80d6e1c59c
|
Merge pull request 'edit' (#232) from lyc-dev into main
|
2024-09-20 13:41:22 +08:00 |
|
lyc
|
75c6777933
|
edit
|
2024-09-20 13:41:18 +08:00 |
|
朱浩
|
a75f151b19
|
Merge pull request 'BUG修复' (#231) from zhuhao_dev into main
Reviewed-on: #231
|
2024-09-20 09:22:02 +08:00 |
|
朱浩
|
2531c25d7c
|
BUG修复
|
2024-09-20 09:21:31 +08:00 |