wangzhongjie 
							
						 
					 
					
						
						
						
						
							
						
						
							d30b6d67ab 
							
						 
					 
					
						
						
							
							fix:提交视频文件mock数据  
						
						 
						
						
						
						
					 
					
						2024-06-04 15:08:27 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wangzhongjie 
							
						 
					 
					
						
						
						
						
							
						
						
							8ec6377f77 
							
						 
					 
					
						
						
							
							fix:提交视频文件mock数据  
						
						 
						
						
						
						
					 
					
						2024-06-04 15:04:30 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9623750d0b 
							
						 
					 
					
						
						
							
							异步串口调试  
						
						 
						
						
						
						
					 
					
						2024-05-29 10:13:37 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							424dc1ab23 
							
						 
					 
					
						
						
							
							串口更新  
						
						 
						
						
						
						
					 
					
						2024-05-27 17:25:20 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Surenjun 
							
						 
					 
					
						
						
						
						
							
						
						
							d793c15c79 
							
						 
					 
					
						
						
							
							feat:评判代码更新  
						
						 
						
						
						
						
					 
					
						2024-05-15 16:22:48 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							70a5e3a0a0 
							
						 
					 
					
						
						
							
							优化部分  
						
						 
						
						
						
						
					 
					
						2024-05-09 13:42:56 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							0f87d3c8a3 
							
						 
					 
					
						
						
							
							杭州现场处理问题  
						
						 
						
						
						
						
					 
					
						2024-03-12 15:32:48 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							848282fe04 
							
						 
					 
					
						
						
							
							新代码  
						
						 
						
						
						
						
					 
					
						2024-03-05 15:44:53 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							0fe5385625 
							
						 
					 
					
						
						
							
							最新代码  
						
						 
						
						
						
						
					 
					
						2024-02-26 15:01:27 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e4206ee3ee 
							
						 
					 
					
						
						
							
							Merge branch 'main' into main  
						
						 
						
						
						
						
					 
					
						2024-02-23 16:10:56 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wangzhongjie 
							
						 
					 
					
						
						
						
						
							
						
						
							c5a3d43e20 
							
						 
					 
					
						
						
							
							feat: userInfo  
						
						 
						
						
						
						
					 
					
						2024-02-23 16:12:22 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							3fcdefeb4e 
							
						 
					 
					
						
						
							
							222  
						
						 
						
						
						
						
					 
					
						2024-02-23 16:08:37 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							e53f84b3d3 
							
						 
					 
					
						
						
							
							提交  
						
						 
						
						
						
						
					 
					
						2024-02-23 15:23:48 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							e6420a333d 
							
						 
					 
					
						
						
							
							1111  
						
						 
						
						
						
						
					 
					
						2024-02-23 10:43:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wangzhongjie 
							
						 
					 
					
						
						
						
						
							
						
						
							a1ff0e8d2c 
							
						 
					 
					
						
						
							
							Merge branch 'main' of  http://88.22.20.16:3000/shutdown/subject-two  
						
						 
						
						
						
						
					 
					
						2024-02-23 10:10:38 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wangzhongjie 
							
						 
					 
					
						
						
						
						
							
						
						
							38d48e778b 
							
						 
					 
					
						
						
							
							Merge branch 'main' of  http://88.22.20.16:3000/shutdown/subject-two  
						
						 
						
						
						
						
					 
					
						2024-02-23 10:06:19 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							62388d126a 
							
						 
					 
					
						
						
							
							提交  
						
						 
						
						
						
						
					 
					
						2024-02-23 10:04:12 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wangzhongjie 
							
						 
					 
					
						
						
						
						
							
						
						
							8e8afd92db 
							
						 
					 
					
						
						
							
							feat: 优化  
						
						 
						
						
						
						
					 
					
						2024-02-23 10:03:43 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wangzhongjie 
							
						 
					 
					
						
						
						
						
							
						
						
							efc98c114b 
							
						 
					 
					
						
						
							
							fix: 优化开始考试代码  
						
						 
						
						
						
						
					 
					
						2024-02-22 17:33:10 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							f49c68a3a5 
							
						 
					 
					
						
						
							
							111  
						
						 
						
						
						
						
					 
					
						2024-02-22 13:35:56 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							4c2515c1fb 
							
						 
					 
					
						
						
							
							22  
						
						 
						
						
						
						
					 
					
						2024-02-22 10:40:35 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wangzhongjie 
							
						 
					 
					
						
						
						
						
							
						
						
							c68804bfa4 
							
						 
					 
					
						
						
							
							feat: 文件修复  
						
						 
						
						
						
						
					 
					
						2024-02-21 15:06:39 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							1331a94454 
							
						 
					 
					
						
						
							
							订单  
						
						 
						
						
						
						
					 
					
						2024-02-21 15:01:42 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							3b38330edd 
							
						 
					 
					
						
						
							
							fix  
						
						 
						
						
						
						
					 
					
						2024-02-21 14:53:53 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wangzhongjie 
							
						 
					 
					
						
						
						
						
							
						
						
							7e10635a22 
							
						 
					 
					
						
						
							
							feat: 文件名规范化  
						
						 
						
						
						
						
					 
					
						2024-02-21 14:51:32 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							fa28b48533 
							
						 
					 
					
						
						
							
							Merge branch 'main' of  http://localhost:3000/shutdown/subject-two  
						
						 
						
						
						
						
					 
					
						2024-02-21 13:34:23 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							ef2b4e363d 
							
						 
					 
					
						
						
							
							init  
						
						 
						
						
						
						
					 
					
						2024-02-21 13:34:14 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wangzhongjie 
							
						 
					 
					
						
						
						
						
							
						
						
							7168caaa92 
							
						 
					 
					
						
						
							
							feat: 文件夹名称规范化  
						
						 
						
						
						
						
					 
					
						2024-02-21 13:31:54 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wangzhongjie 
							
						 
					 
					
						
						
						
						
							
						
						
							ed236df1d6 
							
						 
					 
					
						
						
							
							feat: 修复一些问题  
						
						 
						
						
						
						
					 
					
						2024-02-20 10:22:33 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							ed60046db6 
							
						 
					 
					
						
						
							
							Fix bug in login functionality  
						
						 
						
						... 
						
						
						
						Refactor code for improved performance
Add new feature for user authentication
Update UI for better user experience
Fix typo in variable name
Optimize database queries for faster response times
Add error handling for edge cases
Update documentation with latest changes
Remove unused code
Fix formatting issues 
						
						
					 
					
						2024-01-31 14:44:50 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							93f87208f0 
							
						 
					 
					
						
						
							
							Fix file paths and update versions  
						
						 
						
						
						
						
					 
					
						2024-01-31 14:42:14 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								“wangzhongjie” 
							
						 
					 
					
						
						
						
						
							
						
						
							74bcb8f05c 
							
						 
					 
					
						
						
							
							Refactor code for improved performance  
						
						 
						
						
						
						
					 
					
						2024-01-31 14:35:16 +08:00