| 
						
					 | 
					
						
						
						
						
							
						
						
							a22a8b1b00
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
						
						
						
						
						
						
					 | 
					
						2024-08-26 19:29:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7ba4c2f5f0
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-26 19:27:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8b9ed58a2d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2024-08-26 16:07:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							522b5d32ee
							
						
					 | 
					
						
						
							
							feat:更新
						
						
						
						
						
						
					 | 
					
						2024-08-26 16:07:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							002a1e84d8
							
						
					 | 
					
						
						
							
							設備注冊提示
						
						
						
						
						
						
					 | 
					
						2024-08-26 16:00:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e7e1fc4e9
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-08-26 15:11:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5a9af48cd9
							
						
					 | 
					
						
						
							
							wirteLog
						
						
						
						
						
						
					 | 
					
						2024-08-26 15:09:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9cf8b0dc58
							
						
					 | 
					
						
						
							
							feat:版本号修改
						
						
						
						
						
						
					 | 
					
						2024-08-23 15:59:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5fba22c2ed
							
						
					 | 
					
						
						
							
							彈框修改
						
						
						
						
						
						
					 | 
					
						2024-08-23 13:44:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4e4d357f7a
							
						
					 | 
					
						
						
							
							彈框
						
						
						
						
						
						
					 | 
					
						2024-08-23 09:37:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							86a905e949
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-08-22 15:25:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bd62ff705d
							
						
					 | 
					
						
						
							
							外殼
						
						
						
						
						
						
					 | 
					
						2024-08-22 15:24:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cb86c2b903
							
						
					 | 
					
						
						
							
							feat:添加程序运行里程
						
						
						
						
						
						
					 | 
					
						2024-08-22 13:59:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2efd38f73a
							
						
					 | 
					
						
						
							
							外殼問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-21 18:05:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4380fce2ca
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
						
						
						
						
						
						
					 | 
					
						2024-08-21 11:59:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eac7d94b98
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-21 11:57:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2ab8521d54
							
						
					 | 
					
						
						
							
							feat:更新
						
						
						
						
						
						
					 | 
					
						2024-08-20 14:49:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6d86dad782
							
						
					 | 
					
						
						
							
							拍照error提示
						
						
						
						
						
						
					 | 
					
						2024-08-20 10:56:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fdaba29b5c
							
						
					 | 
					
						
						
							
							彈框修改
						
						
						
						
						
						
					 | 
					
						2024-08-20 09:43:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f61ec2bc2e
							
						
					 | 
					
						
						
							
							外殼問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-20 09:12:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							05f31c4b7c
							
						
					 | 
					
						
						
							
							合并
						
						
						
						
						
						
					 | 
					
						2024-08-19 14:56:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9a618adeff
							
						
					 | 
					
						
						
							
							彈框userlist修改
						
						
						
						
						
						
					 | 
					
						2024-08-19 14:54:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb8e7bc7c5
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-08-19 11:31:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							05f8798973
							
						
					 | 
					
						
						
							
							feat:更新
						
						
						
						
						
						
					 | 
					
						2024-08-19 11:19:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b021e3221e
							
						
					 | 
					
						
						
							
							衝突解決
						
						
						
						
						
						
					 | 
					
						2024-08-19 10:19:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							54403ef2c7
							
						
					 | 
					
						
						
							
							feat:更新
						
						
						
						
						
						
					 | 
					
						2024-08-19 10:11:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f414114cf1
							
						
					 | 
					
						
						
							
							table表修改
						
						
						
						
						
						
					 | 
					
						2024-08-19 09:32:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							559d6cef2c
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-08-16 08:52:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f7717785a5
							
						
					 | 
					
						
						
							
							feat:科目三联网优化
						
						
						
						
						
						
					 | 
					
						2024-08-16 08:52:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							295c8c10cf
							
						
					 | 
					
						
						
							
							userinfo單機修改
						
						
						
						
						
						
					 | 
					
						2024-08-15 17:55:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							56369ec982
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-15 13:48:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f440fd7630
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-15 13:42:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							438e8bc278
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-08-15 09:14:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							45c6b12067
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/common/utils/UdpClientByCenter.ts
#	entry/src/main/ets/pages/TerminalInfos.ets
#	entry/src/main/ets/pages/UserInfo.ets 
						
						
					 | 
					
						2024-08-15 09:05:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fd5fd39fa3
							
						
					 | 
					
						
						
							
							feat:科目三洛阳修改
						
						
						
						
						
						
					 | 
					
						2024-08-15 09:01:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							49358bb95c
							
						
					 | 
					
						
						
							
							單機模式修改
						
						
						
						
						
						
					 | 
					
						2024-08-14 17:26:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b89b0c911e
							
						
					 | 
					
						
						
							
							tcp修改
						
						
						
						
						
						
					 | 
					
						2024-08-14 14:46:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3b121ed5b2
							
						
					 | 
					
						
						
							
							外殼優化
						
						
						
						
						
						
					 | 
					
						2024-08-14 13:15:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f974da9303
							
						
					 | 
					
						
						
							
							外殼修改
						
						
						
						
						
						
					 | 
					
						2024-08-14 09:18:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							829a18a314
							
						
					 | 
					
						
						
							
							洛陽修改
						
						
						
						
						
						
					 | 
					
						2024-08-13 11:50:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1b3093b067
							
						
					 | 
					
						
						
							
							衝突解決
						
						
						
						
						
						
					 | 
					
						2024-08-12 14:54:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e53801f12
							
						
					 | 
					
						
						
							
							提交
						
						
						
						
						
						
					 | 
					
						2024-08-12 14:46:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1704325d87
							
						
					 | 
					
						
						
							
							feat:科目三修改
						
						
						
						
						
						
					 | 
					
						2024-08-12 10:19:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0c2ec74f30
							
						
					 | 
					
						
						
							
							衝突修改
						
						
						
						
						
						
					 | 
					
						2024-08-10 14:35:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3458289d19
							
						
					 | 
					
						
						
							
							問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-10 14:00:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0369c2c98f
							
						
					 | 
					
						
						
							
							feat:评判修改
						
						
						
						
						
						
					 | 
					
						2024-08-08 20:12:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							34017a09d1
							
						
					 | 
					
						
						
							
							日志&&問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-08 18:09:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							afd3dbd72d
							
						
					 | 
					
						
						
							
							udp
						
						
						
						
						
						
					 | 
					
						2024-08-07 08:57:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e14e3d4fb5
							
						
					 | 
					
						
						
							
							feat:科目三优化
						
						
						
						
						
						
					 | 
					
						2024-08-05 09:47:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1a5b2ed48e
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/pages/compontents/SignDisplayCom.ets 
						
						
					 | 
					
						2024-07-31 14:18:09 +08:00 | 
					
					
						
						
							
							
							
						
					 |