| 
						
					 | 
					
						
						
						
						
							
						
						
							26e45415c5
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
						
						
						
						
						
						
					 | 
					
						2025-01-06 13:48:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							77e6dbc78a
							
						
					 | 
					
						
						
							
							feat: 预进项目事件修改
						
						
						
						
						
						
					 | 
					
						2025-01-06 10:23:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0141f8178a
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
						
						
						
						
						
						
					 | 
					
						2025-01-04 14:28:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e828c532de
							
						
					 | 
					
						
						
							
							user
						
						
						
						
						
						
					 | 
					
						2025-01-04 14:27:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d1a2170ee8
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2025-01-04 14:24:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a12d8c79e9
							
						
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2025-01-04 13:51:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9337adc8cc
							
						
					 | 
					
						
						
							
							删除相册&&用户切换
						
						
						
						
						
						
					 | 
					
						2025-01-03 17:24:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							71e51f4e7d
							
						
					 | 
					
						
						
							
							图片删除
						
						
						
						
						
						
					 | 
					
						2025-01-03 13:34:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ff23f6383d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/pages/compontents/judge/DeductionPopup.ets 
						
						
					 | 
					
						2025-01-03 13:08:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							619a67906a
							
						
					 | 
					
						
						
							
							feat:评判相关更新
						
						
						
						
						
						
					 | 
					
						2025-01-03 13:08:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bf0e77bf1f
							
						
					 | 
					
						
						
							
							tcp send重连修改
						
						
						
						
						
						
					 | 
					
						2025-01-03 10:25:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f35cf5fd22
							
						
					 | 
					
						
						
							
							tcp修改提交
						
						
						
						
						
						
					 | 
					
						2025-01-02 19:09:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8b915c2465
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
						
						
						
						
						
						
					 | 
					
						2025-01-02 17:53:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0643956543
							
						
					 | 
					
						
						
							
							dev
						
						
						
						
						
						
					 | 
					
						2025-01-02 17:53:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9dd3b84534
							
						
					 | 
					
						
						
							
							feat:更新
						
						
						
						
						
						
					 | 
					
						2025-01-02 17:50:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ac95a82524
							
						
					 | 
					
						
						
							
							语音修改
						
						
						
						
						
						
					 | 
					
						2025-01-02 11:01:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1f27d8d5a
							
						
					 | 
					
						
						
							
							bug修改
						
						
						
						
						
						
					 | 
					
						2025-01-01 16:18:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							37c99d885c
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
						
						
						
						
						
						
					 | 
					
						2025-01-01 10:40:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2aa2179dc8
							
						
					 | 
					
						
						
							
							拍照响应bug修改
						
						
						
						
						
						
					 | 
					
						2025-01-01 10:40:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0ddf1ac518
							
						
					 | 
					
						
						
							
							feat:request优化
						
						
						
						
						
						
					 | 
					
						2025-01-01 09:38:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							17ef3ce4be
							
						
					 | 
					
						
						
							
							feat:更新
						
						
						
						
						
						
					 | 
					
						2024-12-31 17:51:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c7dd0aa000
							
						
					 | 
					
						
						
							
							feat:request优化
						
						
						
						
						
						
					 | 
					
						2024-12-31 11:31:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f0c6451623
							
						
					 | 
					
						
						
							
							feat:评判修噶
						
						
						
						
						
						
					 | 
					
						2024-12-31 10:36:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e917107df1
							
						
					 | 
					
						
						
							
							提交修改
						
						
						
						
						
						
					 | 
					
						2024-12-31 10:21:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ac5186ef97
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
						
						
						
						
						
						
					 | 
					
						2024-12-30 16:53:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b021a94b8f
							
						
					 | 
					
						
						
							
							考试员单机显示
						
						
						
						
						
						
					 | 
					
						2024-12-30 16:53:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8b6bfd0e20
							
						
					 | 
					
						
						
							
							Revert "feat:评判优化"
						
						
						
						
						
						
						
						This reverts commit 8d489592 
						
						
					 | 
					
						2024-12-30 16:48:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e8f787408a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2024-12-30 16:41:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4bfbfe1516
							
						
					 | 
					
						
						
							
							Revert "feat:评判优化"
						
						
						
						
						
						
						
						This reverts commit 8d489592 
						
						
					 | 
					
						2024-12-30 16:40:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d0ac2bf04a
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
						
						
						
						
						
						
					 | 
					
						2024-12-30 15:32:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c4071d0817
							
						
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-12-30 15:32:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1f645f3b3a
							
						
					 | 
					
						
						
							
							feat:考前绕车一周信号提示关掉
						
						
						
						
						
						
					 | 
					
						2024-12-30 15:11:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fbfb6e9f4f
							
						
					 | 
					
						
						
							
							feat:judgeConfig更改
						
						
						
						
						
						
					 | 
					
						2024-12-30 13:43:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							389258b6ee
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2024-12-30 13:36:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cbb88acae2
							
						
					 | 
					
						
						
							
							feat:评判更新
						
						
						
						
						
						
					 | 
					
						2024-12-30 13:36:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							be34664f42
							
						
					 | 
					
						
						
							
							合并
						
						
						
						
						
						
					 | 
					
						2024-12-30 13:26:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							17106b34c3
							
						
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-12-30 13:21:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							40d5a9cdc0
							
						
					 | 
					
						
						
							
							按钮变化修改
						
						
						
						
						
						
					 | 
					
						2024-12-30 13:20:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							aaeef94c9c
							
						
					 | 
					
						
						
							
							feat:新监管去除照片转换
						
						
						
						
						
						
					 | 
					
						2024-12-30 12:56:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8d489592d8
							
						
					 | 
					
						
						
							
							feat:评判优化
						
						
						
						
						
						
					 | 
					
						2024-12-30 12:53:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1e2b71e499
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2024-12-30 09:22:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c2a74379ef
							
						
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-12-29 21:43:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1fd57572af
							
						
					 | 
					
						
						
							
							feat:初始化异常能结束
						
						
						
						
						
						
					 | 
					
						2024-12-25 09:02:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0fa4bb81cc
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/common/utils/File.ts 
						
						
					 | 
					
						2024-12-24 17:28:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fbc1d49af1
							
						
					 | 
					
						
						
							
							feat:评判写入文件openFile优化
						
						
						
						
						
						
					 | 
					
						2024-12-24 17:27:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1363263b2
							
						
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-12-24 16:43:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2de46a9d1a
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
						
						
						
						
						
						
					 | 
					
						2024-12-20 13:28:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8e2b093a67
							
						
					 | 
					
						
						
							
							修改
						
						
						
						
						
						
					 | 
					
						2024-12-20 13:28:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4ac12f6526
							
						
					 | 
					
						
						
							
							feat:gitigore文件添加
						
						
						
						
						
						
					 | 
					
						2024-12-20 11:33:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fbfdbd797b
							
						
					 | 
					
						
						
							
							feat:差分异常显示处理
						
						
						
						
						
						
					 | 
					
						2024-12-20 09:28:49 +08:00 | 
					
					
						
						
							
							
							
						
					 |