zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity
706 Commits 10 Branches 3 Tags 32 MiB
Commit Graph

706 Commits

Author SHA1 Message Date
朱浩 82548ce937 Merge remote-tracking branch 'origin/main' 2024-12-12 16:55:19 +08:00
朱浩 aa3be39721 研学相关权限问题 2024-12-12 16:55:08 +08:00
baigl c3b975fee9 Merge pull request 'baigl' (#126) from baigl into main 
Reviewed-on: #126
 2024-12-12 16:45:29 +08:00
白了个白 ea2a8ebfda Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-12 16:44:36 +08:00
白了个白 308465adb4 ppts： 64转file 提取到utils image中 2024-12-12 16:44:03 +08:00
yangws 469116701b Merge pull request 'fix：修改pptlist活动的bug；' (#125) from yws_dev into main 
Reviewed-on: #125
 2024-12-12 16:39:46 +08:00
小杨 7861727e92 fix：修改pptlist活动的bug； 2024-12-12 16:39:01 +08:00
zdg 80b66ffb28 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 16:38:44 +08:00
zhangxuelin c5e71e6e7b Merge pull request '修改作业弹窗' (#122) from zxl into main 
Reviewed-on: #122
 2024-12-12 16:38:33 +08:00
zhangxuelin c7ebc6de65 1 2024-12-12 16:37:51 +08:00
zhangxuelin b906a1e688 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-12 16:37:22 +08:00
baigl f75ab621d2 Merge pull request 'baigl' (#124) from baigl into main 
Reviewed-on: #124
 2024-12-12 16:35:47 +08:00
白了个白 a711eb2745 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-12 16:35:04 +08:00
白了个白 363b284b7c 1 2024-12-12 16:34:47 +08:00
zdg 75b5884210 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 16:24:53 +08:00
zdg 03f160464c ppt上课 2024-12-12 16:24:47 +08:00
baigl dc4c0fd334 Merge pull request 'baigl' (#123) from baigl into main 
Reviewed-on: #123
 2024-12-12 16:24:36 +08:00
白了个白 fb3ffd5dda Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-12 16:23:51 +08:00
白了个白 5771533039 ppts: 插入试题 图片路径存储修改 2024-12-12 16:23:28 +08:00
zhangxuelin 75ea11e171 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-12 16:15:55 +08:00
zhangxuelin 851a39897b 修改作业弹窗 2024-12-12 16:15:16 +08:00
zhangxuelin 69bfc68b28 Merge pull request '作业弹窗' (#121) from zxl into main 
Reviewed-on: #121
 2024-12-12 16:12:53 +08:00
zhangxuelin 590b318757 作业弹窗 2024-12-12 16:12:32 +08:00
CYS 4421ee7fea Merge pull request '政治课标dataset_id修改' (#120) from cys_dev into main 
Reviewed-on: #120
 2024-12-12 16:05:55 +08:00
cys 19ef95447c 1 2024-12-12 16:04:43 +08:00
baigl 25b6da7f26 Merge pull request '教程分析：pdf页面展示修改' (#119) from baigl into main 
Reviewed-on: #119
 2024-12-12 15:27:00 +08:00
白了个白 892b4ee3b0 教程分析：pdf页面展示修改 2024-12-12 15:26:14 +08:00
zdg 354e0b44c9 生产环境地址 2024-12-12 12:27:01 +08:00
zdg 5e04a4c2c2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 12:21:53 +08:00
zdg ca93eb72ac 更新消息 2024-12-12 12:21:47 +08:00
yangws 3d8f7c2a3a Merge pull request 'fix：修改pptlist添加活动的bug；' (#118) from yws_dev into main 
Reviewed-on: #118
 2024-12-12 11:27:19 +08:00
小杨 78cc5edd39 fix：修改pptlist添加活动的bug； 2024-12-12 11:26:26 +08:00
朱浩 9f4e232d6f Merge remote-tracking branch 'origin/main' 2024-12-12 11:20:12 +08:00
朱浩 afc9fe89d1 解决按钮层级问题 2024-12-12 11:19:38 +08:00
朱浩 894ed269ce 解决生产无法关闭PPTIST页面问题 2024-12-12 11:17:12 +08:00
zdg b15fa29ffa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 11:02:22 +08:00
zhangxuelin 64d2dbcabb Merge pull request '点赞疑问' (#117) from zxl into main 
Reviewed-on: #117
 2024-12-12 10:58:09 +08:00
zhangxuelin f4cb3a8916 点赞疑问 2024-12-12 10:57:48 +08:00
yangws 69db6bd8b1 Merge pull request '清除debugger;' (#116) from yws_dev into main 
Reviewed-on: #116
 2024-12-12 10:53:38 +08:00
小杨 e522fc8ee5 清除debugger; 2024-12-12 10:53:15 +08:00
yangws 5b50404d3c Merge pull request 'fix：修改ppt添加活动的bug；' (#115) from yws_dev into main 
Reviewed-on: #115
 2024-12-12 10:52:40 +08:00
小杨 bbed835ffe fix：修改ppt添加活动的bug； 2024-12-12 10:52:10 +08:00
zdg 9ef4812acb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 10:31:00 +08:00
zhangxuelin d9bdd5424f Merge pull request '点赞和疑问' (#114) from zxl into main 
Reviewed-on: #114
 2024-12-12 10:29:16 +08:00
zhangxuelin 979621b515 点赞和疑问 2024-12-12 10:28:32 +08:00
zdg d313f901a3 去掉注释 2024-12-11 17:32:11 +08:00
zdg 8990ffdc58 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-11 17:17:01 +08:00
zdg 13b1a895a4 上课 socket 2024-12-11 17:16:55 +08:00
朱浩 9c7aeb1a27 Merge remote-tracking branch 'origin/main' 2024-12-11 17:11:22 +08:00
lyc 7545e68a62 Merge pull request 'edit' (#113) from lyc-dev into main 2024-12-11 17:04:37 +08:00