zouyf

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-24 16:24:31 +08:00

c957961a0b Merge branch 'main' into zouyf_dev

09159ae2d8 Merge pull request 'zhuhao_dev' (#260) from zhuhao_dev into main

d3a3acdedc 解决冲突

1a678afb89 Merge branch 'main' into zhuhao_dev

da20aecfc6 更名文枢课堂

Compare 15 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-24 15:54:53 +08:00

26576ad086 Merge branch 'main' into zouyf_dev

32baef766f Merge pull request 'qinqing_dev' (#259) from qinqing_dev into main

65f959c492 Merge pull request 'main' (#258) from main into qinqing_dev

4d7b69c8c2 课标分析

0e832a4a32 Merge pull request 'fix:2.0.4bug修改;' (#250) from yangws into main

Compare 35 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-23 09:27:19 +08:00

d1ab430a6c Merge branch 'main' into zouyf_dev

27c7033522 Merge pull request 'yangws' (#249) from yangws into main

4c66cc90c0 BUG修复

c2b54714ac Merge pull request '跳转增加bookid' (#248) from lyc-dev into main

cafea2d719 跳转增加bookid

Compare 77 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-19 14:05:18 +08:00

7f9afedef9 Merge branch 'main' into zouyf_dev

aa35621b59 Merge pull request 'zdg' (#222) from zdg into main

49de9ee9c2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

0ef5ef424f bug修复，以及代码优化

89ae43a458 Merge pull request 'baigl' (#221) from baigl into main

Compare 6 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-19 11:12:00 +08:00

7dcfd487fc Merge branch 'main' into zouyf_dev

b06ad0f411 Merge pull request 'baigl' (#220) from baigl into main

129f875469 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl

2c6da76cf7 作业设计跳转web端逻辑修改

bae24601ef Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl

Compare 6 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-18 20:02:57 +08:00

499e428138 Merge branch 'main' into zouyf_dev

c58322ca0b Merge pull request '作业查询修改' (#219) from lyc-dev into main

08dad41e4d 作业查询修改

675613bbee Merge pull request 'zdg' (#218) from zdg into main

9188df0d94 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

Compare 6 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-18 14:57:52 +08:00

4e835cac82 Merge branch 'main' into zouyf_dev

d047e85d03 Merge pull request 'fix: 个人中心任选学科报错问题;' (#217) from yangws into main

acd66c11fa fix: 个人中心任选学科报错问题;

c32bd6eef4 Merge pull request 'fix: 解决资源库报错的问题;' (#216) from yangws into main

3b9877e788 fix: 解决资源库报错的问题;

Compare 11 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-17 19:56:35 +08:00

70ba70df45 [作业设计] - 增加页面

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-16 15:00:05 +08:00

7ae8547d41 Merge pull request '作业批改 loading Bug修复' (#212) from baigl into main

c5c28b4bf5 Merge pull request 'zdg' (#211) from zdg into main

67d7395c47 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

46adf4c058 作业批改 loading Bug修复

f615efbd88 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

Compare 9 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-14 16:35:23 +08:00

a67f801356 Merge pull request 'zhuhao_dev' (#210) from zhuhao_dev into main

1c89217fbf Merge branch 'main' into zhuhao_dev

3a20f453c6 APT上课

dfa5c7d99b APT上课

e144fbe36a Merge pull request 'lyc-dev' (#209) from lyc-dev into main

Compare 19 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-13 17:36:55 +08:00

a92176174a Merge pull request '作业查询' (#206) from lyc-dev into main

8063783284 作业查询

eadc6f1440 Merge pull request '工作台、资源库调整' (#205) from lyc-dev into main

8753951796 工作台、资源库调整

Compare 4 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-13 14:37:12 +08:00

e907a1c07a Merge pull request 'fix: 解决资源库报错的问题;' (#204) from yangws into main

1afaed082a fix: 解决资源库报错的问题;

69362a6153 Merge pull request 'lyc-dev' (#203) from lyc-dev into main

1da3ca0ee0 Merge branch 'main' into lyc-dev

d4a6f74cfc 首页调整

Compare 6 commits »

zouyf pushed to main at zhuhao/AIx_Smarttalk

2024-09-12 15:59:02 +08:00

f57c67aab2 Merge pull request 'zouyf_dev' (#202) from zouyf_dev into main

63ad74c77f Merge branch 'main' into zouyf_dev

d171117f03 tmp

Compare 3 commits »

zouyf merged pull request zhuhao/AIx_Smarttalk#202

2024-09-12 15:59:01 +08:00

zouyf_dev

zouyf created pull request zhuhao/AIx_Smarttalk#202

2024-09-12 15:58:53 +08:00

zouyf_dev

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-12 15:58:33 +08:00

63ad74c77f Merge branch 'main' into zouyf_dev

0426b85d3f Merge pull request '工作台' (#201) from lyc-dev into main

17b8ce1dda 工作台

5778a8955d Merge pull request 'fix: 提示教材没有时选择教材;' (#200) from yangws into main

e4e23e7508 Merge pull request '排序问题处理' (#199) from zhuhao_dev into main

Compare 35 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-12 15:58:16 +08:00

d171117f03 tmp

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-10 17:14:39 +08:00

db6ebbdbaf Merge pull request 'lyc-dev' (#187) from lyc-dev into main

e2017c3553 冲突-file-preview

0be3d131e2 聊天机器人

8ec738de46 Merge pull request 'add:新增加入班级;' (#185) from yangws into main

076a510109 add:新增加入班级;

Compare 25 commits »

zouyf pushed to zouyf_dev at zhuhao/AIx_Smarttalk

2024-09-10 13:58:08 +08:00

4996af57c7 Merge pull request 'baigl' (#180) from baigl into main

7a4cc9eb64 1

fd6aa2a56a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl

6be4b3526e 作业批改：优化轮询机制

0b6b0c318d 作业批改：报告迁入

Compare 15 commits »

zouyf pushed to main at zhuhao/AIx_Smarttalk

2024-09-10 09:43:16 +08:00

d896209948 Merge pull request '[考试分析] - 修改路由' (#179) from zouyf_dev into main

c618ec04c7 [考试分析] - 修改路由

Compare 2 commits »