| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0369c2c98f
							
						
					 | 
					
						
						
							
							feat:评判修改
						
						
						
						
						
						
					 | 
					
						2024-08-08 20:12:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							60d8f3dec4
							
						
					 | 
					
						
						
							
							Merge pull request '日志&&問題修改' (#50) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #50 
						
						
					 | 
					
						2024-08-08 19:29:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							34017a09d1
							
						
					 | 
					
						
						
							
							日志&&問題修改
						
						
						
						
						
						
					 | 
					
						2024-08-08 18:09:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ca57859bee
							
						
					 | 
					
						
						
							
							Merge pull request '表更新' (#47) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #47 
						
						
					 | 
					
						2024-08-08 17:24:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							afd3dbd72d
							
						
					 | 
					
						
						
							
							udp
						
						
						
						
						
						
					 | 
					
						2024-08-07 08:57:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d04828c5b4
							
						
					 | 
					
						
						
							
							Merge branch 'main' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-08-06 08:55:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a2fef1e83a
							
						
					 | 
					
						
						
							
							Merge pull request 'feat_surenjun' (#49) from feat_surenjun into main
						
						
						
						
						
						
						
						Reviewed-on: #49 
						
						
					 | 
					
						2024-08-05 11:08:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5b43845710
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-08-05 09:49:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e14e3d4fb5
							
						
					 | 
					
						
						
							
							feat:科目三优化
						
						
						
						
						
						
					 | 
					
						2024-08-05 09:47:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6abd03b0b8
							
						
					 | 
					
						
						
							
							font-size修改
						
						
						
						
						
						
					 | 
					
						2024-08-02 15:40:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2a78525e42
							
						
					 | 
					
						
						
							
							表更新
						
						
						
						
						
						
					 | 
					
						2024-08-02 15:27:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7c60a89f96
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-08-02 11:30:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1d14f2bf7d
							
						
					 | 
					
						
						
							
							Merge pull request 'feat_surenjun' (#46) from feat_surenjun into main
						
						
						
						
						
						
						
						Reviewed-on: #46 
						
						
					 | 
					
						2024-08-02 11:29:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							71ee2a79cb
							
						
					 | 
					
						
						
							
							feat:userInfo修改
						
						
						
						
						
						
					 | 
					
						2024-08-02 11:28:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ffe80d9d8f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feat_surenjun' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-08-02 11:16:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0a2e8e2dc9
							
						
					 | 
					
						
						
							
							Merge pull request 'feat_surenjun' (#44) from feat_surenjun into main
						
						
						
						
						
						
						
						Reviewed-on: #44 
						
						
					 | 
					
						2024-08-02 11:13:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b3087769a1
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-08-02 11:10:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							26a787401d
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
					 | 
					
						2024-08-02 11:05:33 +08:00 | 
					
					
						
						
							
							
							
						
					 |