515 Commits

Author SHA1 Message Date
cb276de665 删除无用文件 2024-07-09 13:18:50 +08:00
acc9f03109 udp修改 2024-07-09 13:13:59 +08:00
90133c0729 济南修改 2024-07-09 11:11:31 +08:00
04483be75c Merge pull request '济南修改' (#24) from lv_chengmai into main
Reviewed-on: #24
2024-07-08 13:49:12 +08:00
92aa41bacc 济南修改 2024-07-05 18:10:12 +08:00
4a72761601 feat:济南问题修改 2024-07-05 09:34:03 +08:00
83f6633957 Merge branch 'main' into feat_surenjun 2024-07-05 09:18:50 +08:00
18e04d029f Merge pull request 'lv_chengmai' (#23) from lv_chengmai into main
Reviewed-on: #23
2024-07-05 09:08:18 +08:00
97768c336d 济南提交 2024-07-05 09:08:17 +08:00
a117df4cac Merge branch 'main' of http://88.22.24.105:3000/harmony_car/subject-two 2024-07-04 10:20:47 +08:00
f4fbb5702d Merge pull request 'lv' (#22) from lv into main
Reviewed-on: #22
2024-07-04 10:07:50 +08:00
22acd782b9 表修改 2024-07-03 16:21:56 +08:00
9c83bdae52 表修改 2024-07-03 16:19:55 +08:00
Surenjun
1190d4da03 feat:科目三更新 2024-07-02 15:24:47 +08:00
009bd53f46 Merge branch 'main' into lv
# Conflicts:
#	entry/src/main/ets/pages/Index.ets
#	entry/src/main/ets/pages/UserInfo.ets
2024-07-02 13:43:46 +08:00
d8eccae6ea 配置暫存 2024-07-02 13:19:39 +08:00
da0db68a59 Merge pull request 'wangzhongjie' (#21) from wangzhongjie into main
Reviewed-on: #21
2024-07-02 11:39:52 +08:00
wangzhongjie
efcb6f79ad fix:将部分假数据移入mock 2024-07-02 11:39:46 +08:00
wangzhongjie
998a1adb0d fix:优化了部分代码 2024-07-02 11:10:33 +08:00
wangzhongjie
b82d3ff6bc fix:修复一个写法问题 2024-07-02 10:42:53 +08:00
273a411f83 Merge pull request 'feat_surenjun' (#20) from feat_surenjun into main
Reviewed-on: #20
2024-07-02 10:35:19 +08:00
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
f89fe36b10 cpp更新 2024-07-02 09:01:57 +08:00
b8aa90e86e socket丟失修改 2024-07-02 08:59:03 +08:00
102baf587e Merge pull request '表更新' (#18) from lv into main
Reviewed-on: #18
2024-07-01 16:13:29 +08:00
71ed3fb4d4 表更新 2024-07-01 12:36:46 +08:00
c3f0abae09 Merge pull request '济南修改' (#17) from lv into main
Reviewed-on: #17
2024-07-01 11:24:10 +08:00
0f42f45cb9 济南修改 2024-06-27 20:53:36 +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
0c89302ef9 依赖删除 2024-06-04 16:19:20 +08:00
3b3a38e2c9 Merge pull request 'lv' (#16) from lv into main
Reviewed-on: #16
2024-06-04 16:16:56 +08:00
8e6ca1a051 合并 2024-06-04 16:01:54 +08:00
664a4a91c6 废弃代码 2024-06-04 16:00:01 +08:00
54c7428b36 注释添加 2024-06-04 15:56:50 +08:00
a48ba68e5c context修改 2024-06-04 15:36:45 +08:00
84dafffd17 Merge pull request 'fix:提交视频文件mock数据' (#15) from wangzhongjie into main
Reviewed-on: #15
2024-06-04 15:04:36 +08:00
wangzhongjie
d30b6d67ab fix:提交视频文件mock数据 2024-06-04 15:08:27 +08:00
wangzhongjie
8ec6377f77 fix:提交视频文件mock数据 2024-06-04 15:04:30 +08:00
cce66ee074 Merge pull request 'fix:提交视频文件mock数据' (#14) from wangzhongjie into main
Reviewed-on: #14
2024-06-04 15:01:04 +08:00
b3e51a565d 注释添加冲突回复 2024-06-04 14:18:44 +08:00
b269b1d913 废弃代码 2024-06-04 13:14:48 +08:00
45d394d89d 提交代码 2024-06-04 12:09:08 +08:00