|  | 2d18527b96 | Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev | 2024-08-20 09:16:14 +08:00 |  | 
			
				
					|  | 63542bef08 | feat:globalThis.lsh修改 | 2024-08-20 09:13:43 +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 |  | 
			
				
					|  | 638477891c | Merge branch 'main' into lv_chengmai | 2024-08-19 09:33:50 +08:00 |  | 
			
				
					|  | f414114cf1 | table表修改 | 2024-08-19 09:32:41 +08:00 |  | 
			
				
					|  | 0837bd20d8 | feat:userInfo修改 | 2024-08-16 08:53:46 +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 |  | 
			
				
					|  | 1301334230 | Merge pull request 'lv_chengmai' (#62) from lv_chengmai into main Reviewed-on: #62 | 2024-08-16 08:40:53 +08:00 |  | 
			
				
					|  | 8c62d6f365 | Merge branch 'main' into lv_chengmai | 2024-08-15 17:56:54 +08:00 |  | 
			
				
					|  | 295c8c10cf | userinfo單機修改 | 2024-08-15 17:55:47 +08:00 |  | 
			
				
					|  | b6ea810892 | Merge pull request 'lv_chengmai' (#61) from lv_chengmai into main Reviewed-on: #61 | 2024-08-15 14:24:01 +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 |  | 
			
				
					|  | b96d9fb27c | Merge pull request 'feat_surenjun' (#60) from feat_surenjun into main Reviewed-on: #60 | 2024-08-15 09:13:18 +08:00 |  | 
			
				
					|  | eb1ea1c5b4 | feat:删除多余文件 | 2024-08-15 09:09:39 +08:00 |  | 
			
				
					|  | 7f891b3644 | Merge pull request '單機模式修改' (#59) from lv_chengmai into main Reviewed-on: #59 | 2024-08-15 09:08:36 +08:00 |  | 
			
				
					|  | 9be231d31e | feat:合并代码 | 2024-08-15 09:05:53 +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 |  | 
			
				
					|  | f98ce3d832 | Merge pull request 'tcp修改' (#58) from lv_chengmai into main Reviewed-on: #58 | 2024-08-14 14:52:08 +08:00 |  | 
			
				
					|  | b89b0c911e | tcp修改 | 2024-08-14 14:46:33 +08:00 |  | 
			
				
					|  | 3b121ed5b2 | 外殼優化 | 2024-08-14 13:15:03 +08:00 |  | 
			
				
					|  | a617763947 | Merge pull request 'lv_chengmai' (#57) from lv_chengmai into main Reviewed-on: #57 | 2024-08-14 13:12:44 +08:00 |  | 
			
				
					|  | d743f22889 | Merge branch 'main' into lv_chengmai | 2024-08-14 09:19:52 +08:00 |  | 
			
				
					|  | f974da9303 | 外殼修改 | 2024-08-14 09:18:33 +08:00 |  | 
			
				
					|  | 4bc2a88b7c | Merge branch 'main' into lv_chengmai | 2024-08-13 11:51:39 +08:00 |  | 
			
				
					|  | 829a18a314 | 洛陽修改 | 2024-08-13 11:50:38 +08:00 |  | 
			
				
					|  | f720674c7b | Merge pull request 'lv_chengmai' (#56) from lv_chengmai into main Reviewed-on: #56 | 2024-08-13 11:48:30 +08:00 |  | 
			
				
					|  | 1b3093b067 | 衝突解決 | 2024-08-12 14:54:10 +08:00 |  | 
			
				
					|  | fd4db7b355 | Merge pull request 'lv_chengmai' (#55) from lv_chengmai into main Reviewed-on: #55 | 2024-08-12 14:52:06 +08:00 |  | 
			
				
					|  | 3e53801f12 | 提交 | 2024-08-12 14:46:16 +08:00 |  | 
			
				
					|  | 1dd23b9768 | Merge pull request 'feat_surenjun' (#54) from feat_surenjun into main Reviewed-on: #54 | 2024-08-12 14:37:17 +08:00 |  | 
			
				
					|  | 6d7e173080 | feat:删除多余文件 | 2024-08-12 10:21:40 +08:00 |  | 
			
				
					|  | 1704325d87 | feat:科目三修改 | 2024-08-12 10:19:31 +08:00 |  | 
			
				
					|  | 75058b49bb | carchekc和dialog | 2024-08-12 09:28:12 +08:00 |  | 
			
				
					|  | 2f4eadea15 | Merge pull request 'carchekc和dialog' (#53) from lv_chengmai into main Reviewed-on: #53 | 2024-08-12 09:26:33 +08:00 |  | 
			
				
					|  | 0c2ec74f30 | 衝突修改 | 2024-08-10 14:35:16 +08:00 |  | 
			
				
					|  | 3b0db245cc | Merge pull request '問題修改' (#52) from lv_chengmai into main Reviewed-on: #52 | 2024-08-10 14:35:16 +08:00 |  | 
			
				
					|  | aceaf3ea30 | Merge pull request 'feat_surenjun' (#51) from feat_surenjun into main Reviewed-on: #51 | 2024-08-10 14:13:18 +08:00 |  | 
			
				
					|  | 3458289d19 | 問題修改 | 2024-08-10 14:00:18 +08:00 |  | 
			
				
					|  | 36cb737068 | feat:评判修改 | 2024-08-08 20:15:02 +08:00 |  |