feat_surenjun #20

Merged
wangzhongjie merged 11 commits from feat_surenjun into main 2024-07-02 10:35:24 +08:00

11 Commits

Author SHA1 Message Date
Surenjun
2f9db78e1b feat:合并master 2024-07-02 10:26:42 +08:00
Surenjun
45cf28fac8 feat:合并master 2024-07-02 10:14:38 +08:00
Surenjun
8bfa67b9e3 Merge branch 'main' into feat_surenjun
# Conflicts:
#	entry/src/main/ets/pages/Judge.ets
#	entry/src/main/ets/pages/RealTime.ets
#	entry/src/main/ets/pages/compontents/judge/video-play.ets
#	entry/src/main/ets/pages/judgeSDK/judge.ts
#	entry/src/main/ets/pages/judgeSDK/utils/judge-config.ts
2024-07-02 10:12:58 +08:00
Surenjun
5524d0e7c9 feat:语音文件更新 2024-07-02 10:02:22 +08:00
Surenjun
3d5bba8022 Merge remote-tracking branch 'origin/feat_surenjun' into feat_surenjun 2024-06-21 10:48:26 +08:00
Surenjun
2481438651 feat:无锡usb设备调试 2024-06-21 10:45:53 +08:00
Surenjun
e355f3d283 feat:无锡usb设备调试 2024-06-20 10:49:51 +08:00
Surenjun
94e060187e feat:无锡usb设备调试 2024-06-20 10:47:02 +08:00
Surenjun
982fd6273d feat:科目三问题修改 2024-06-18 16:44:24 +08:00
Surenjun
fcf41bb2f0 feat:sysset表387参数修改 2024-06-18 09:27:30 +08:00
Surenjun
ef94029967 feat:评判更新 2024-05-17 16:34:52 +08:00