|  | 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 |  | 
			
				
					|  | 5e677eff7b | 合并代码 | 2024-06-04 12:08:32 +08:00 |  | 
			
				
					|  | 2abfeb4d94 | 合并代码 | 2024-06-04 12:08:23 +08:00 |  | 
			
				
					|  | 637b123fcc | 合并代码 | 2024-06-04 12:07:21 +08:00 |  | 
			
				
					|  | 905ac5b9b1 | Merge branch 'main' into lv | 2024-06-04 12:06:57 +08:00 |  | 
			
				
					|  | 168a2f5eac | 暂存代码 | 2024-06-04 11:30:44 +08:00 |  | 
			
				
					| 
							
							
								 wangzhongjie | e65c48f1eb | 优化了部分代码 | 2024-06-04 11:28:15 +08:00 |  | 
			
				
					|  | 59b3c56392 | Merge pull request 'wangzhongjie' (#12) from wangzhongjie into main Reviewed-on: #12 | 2024-06-04 11:24:50 +08:00 |  | 
			
				
					| 
							
							
								 wangzhongjie | da6a85f02a | Merge branch 'main' into wangzhongjie # Conflicts:
#	entry/src/main/ets/pages/TerminalInfos.ets
#	entry/src/main/ets/pages/VideoConfig.ets
#	entry/src/main/ets/pages/compontents/SignDisplayCom.ets | 2024-06-04 11:23:06 +08:00 |  | 
			
				
					| 
							
							
								 wangzhongjie | b9a69d2d84 | 优化了部分代码 | 2024-06-04 11:19:22 +08:00 |  | 
			
				
					|  | d6f0543e9d | Merge pull request 'lv' (#9) from lv into main Reviewed-on: #9 | 2024-06-04 09:51:06 +08:00 |  | 
			
				
					|  | 600dfbe397 | 润和串口调试 | 2024-05-30 15:52:03 +08:00 |  | 
			
				
					|  | 9623750d0b | 异步串口调试 | 2024-05-29 10:13:37 +08:00 |  | 
			
				
					|  | 424dc1ab23 | 串口更新 | 2024-05-27 17:25:20 +08:00 |  | 
			
				
					|  | 0d6fb0a2f4 | Merge pull request 'lv' (#7) from lv into main Reviewed-on: #7 | 2024-05-27 13:04:27 +08:00 |  | 
			
				
					|  | 63145aec13 | udp动态绑定修改 | 2024-05-23 08:45:29 +08:00 |  | 
			
				
					|  | ad864aaadb | Merge pull request 'main' (#6) from main into lv Reviewed-on: #6 | 2024-05-22 08:52:16 +08:00 |  | 
			
				
					|  | 8609d30a0a | Merge pull request 'feat:cpp代码更新' (#5) from feat_surenjun into main Reviewed-on: #5 | 2024-05-22 08:50:27 +08:00 |  | 
			
				
					|  | 902130f07a | feat:cpp代码更新 | 2024-05-21 19:45:15 +08:00 |  | 
			
				
					|  | b05c4ce39e | Merge pull request 'lv' (#3) from lv into main Reviewed-on: #3 | 2024-05-21 11:17:01 +08:00 |  | 
			
				
					|  | 60582e4e5e | carChekck检查项添加 | 2024-05-20 09:09:30 +08:00 |  | 
			
				
					| 
							
							
								 Surenjun | ef94029967 | feat:评判更新 | 2024-05-17 16:34:52 +08:00 |  | 
			
				
					|  | 8cfcff1bef | 更新 | 2024-05-17 08:55:23 +08:00 |  | 
			
				
					| 
							
							
								 Surenjun | ed0858a5c0 | feat:错误信息修改 | 2024-05-16 11:19:10 +08:00 |  | 
			
				
					|  | 0e2aeaed11 | Merge pull request 'feat_surenjun' (#2) from feat_surenjun into main Reviewed-on: #2 | 2024-05-16 11:17:07 +08:00 |  | 
			
				
					| 
							
							
								 Surenjun | 18fff647a6 | Merge branch 'main' into feat_surenjun # Conflicts:
#	entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp
#	entry/src/main/ets/common/utils/FileConfig.ts
#	entry/src/main/ets/common/utils/SerialPortClient.ts
#	entry/src/main/ets/common/utils/request.ts | 2024-05-16 11:09:07 +08:00 |  | 
			
				
					| 
							
							
								 “wangzhongjie” | 059ff04fad | 拉取SVN | 2024-05-16 11:05:19 +08:00 |  | 
			
				
					| 
							
							
								 “wangzhongjie” | 4fe8bc2a39 | 拉取SVN | 2024-05-16 09:53:10 +08:00 |  |