| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d0e8ab90d0
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-08-02 11:05:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							908c579591
							
						
					 | 
					
						
						
							
							Merge pull request 'lv_chengmai' (#42) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #42 
						
						
					 | 
					
						2024-08-02 09:33:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							48540ef01b
							
						
					 | 
					
						
						
							
							accounttable优化
						
						
						
						
						
						
					 | 
					
						2024-08-01 17:47:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d66793359b
							
						
					 | 
					
						
						
							
							updataTable
						
						
						
						
						
						
					 | 
					
						2024-08-01 17:36:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							38a3436b2c
							
						
					 | 
					
						
						
							
							切换学员乱码修改
						
						
						
						
						
						
					 | 
					
						2024-08-01 17:04:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							65421ce6bc
							
						
					 | 
					
						
						
							
							Merge branch 'main' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-08-01 16:56:23 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7b27578efd
							
						
					 | 
					
						
						
							
							Merge pull request 'feat_surenjun' (#41) from feat_surenjun into main
						
						
						
						
						
						
						
						Reviewed-on: #41 
						
						
					 | 
					
						2024-07-31 14:14:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7338d854b4
							
						
					 | 
					
						
						
							
							Merge pull request '信号显示修改' (#39) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #39 
						
						
					 | 
					
						2024-07-31 14:01:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							672e1fa229
							
						
					 | 
					
						
						
							
							Merge branch 'main' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-07-31 13:58:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ddaefab76f
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-07-31 13:47:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c844c19b60
							
						
					 | 
					
						
						
							
							信号显示修改
						
						
						
						
						
						
					 | 
					
						2024-07-31 13:19:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b987bac5f0
							
						
					 | 
					
						
						
							
							Merge pull request 'lv_chengmai' (#38) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #38 
						
						
					 | 
					
						2024-07-30 10:41:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3bbf35a1db
							
						
					 | 
					
						
						
							
							tcp修改
						
						
						
						
						
						
					 | 
					
						2024-07-30 10:35:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							33a719a462
							
						
					 | 
					
						
						
							
							双中心修改
						
						
						
						
						
						
					 | 
					
						2024-07-29 14:29:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							abb3e1bb47
							
						
					 | 
					
						
						
							
							双中心修改
						
						
						
						
						
						
					 | 
					
						2024-07-29 09:51:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bf8e2226a7
							
						
					 | 
					
						
						
							
							carcheck修改
						
						
						
						
						
						
					 | 
					
						2024-07-29 08:56:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							23ea400ee3
							
						
					 | 
					
						
						
							
							Merge pull request 'lv_chengmai' (#37) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #37 
						
						
					 | 
					
						2024-07-19 14:50:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							60a55f585d
							
						
					 | 
					
						
						
							
							tcp重连
						
						
						
						
						
						
					 | 
					
						2024-07-19 13:27:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1be1d806f7
							
						
					 | 
					
						
						
							
							host优化
						
						
						
						
						
						
					 | 
					
						2024-07-19 09:21:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							abc48bd774
							
						
					 | 
					
						
						
							
							Merge pull request '设备注册修改' (#36) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #36 
						
						
					 | 
					
						2024-07-18 15:20:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							699317b1fe
							
						
					 | 
					
						
						
							
							Merge branch 'main' into lv_chengmai
						
						
						
						
						
						
					 | 
					
						2024-07-18 09:35:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							43a673fa4f
							
						
					 | 
					
						
						
							
							设备注册修改
						
						
						
						
						
						
					 | 
					
						2024-07-17 10:19:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e509779f1
							
						
					 | 
					
						
						
							
							Merge pull request 'feat_surenjun' (#35) from feat_surenjun into main
						
						
						
						
						
						
						
						Reviewed-on: #35 
						
						
					 | 
					
						2024-07-17 09:01:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a7cf1eb007
							
						
					 | 
					
						
						
							
							Merge branch 'main' into feat_surenjun
						
						
						
						
						
						
						
						# Conflicts:
#	entry/src/main/ets/pages/Index.ets 
						
						
					 | 
					
						2024-07-17 09:02:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9473b8c466
							
						
					 | 
					
						
						
							
							Merge pull request 'host配置修改' (#33) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #33 
						
						
					 | 
					
						2024-07-16 17:43:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a3f04ed436
							
						
					 | 
					
						
						
							
							首页音频
						
						
						
						
						
						
					 | 
					
						2024-07-16 17:35:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c4d02a8a9e
							
						
					 | 
					
						
						
							
							权限修改
						
						
						
						
						
						
					 | 
					
						2024-07-16 17:32:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							03df4becd9
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-07-16 17:32:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f9be42f086
							
						
					 | 
					
						
						
							
							host配置修改
						
						
						
						
						
						
					 | 
					
						2024-07-16 17:23:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1a4301f424
							
						
					 | 
					
						
						
							
							feat:科目三评判优化
						
						
						
						
						
						
					 | 
					
						2024-07-16 15:02:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4038aa6858
							
						
					 | 
					
						
						
							
							Merge pull request 'c++' (#30) from lv_chengmai into main
						
						
						
						
						
						
						
						Reviewed-on: #30 
						
						
					 | 
					
						2024-07-16 14:31:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9ac3e76957
							
						
					 | 
					
						
						
							
							feat:删除无用文件
						
						
						
						
						
						
					 | 
					
						2024-07-16 12:55:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							811b6e4812
							
						
					 | 
					
						
						
							
							Merge branch 'main' of http://88.22.24.105:3000/harmony_car/subject-two
						
						
						
						
						
						
					 | 
					
						2024-07-16 11:12:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhongjie
							
						 
					 | 
					
						
						
						
						
							
						
						
							0121207189
							
						
					 | 
					
						
						
							
							fix:忽略cpp目录
						
						
						
						
						
						
					 | 
					
						2024-07-16 11:12:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							af40efb3f6
							
						
					 | 
					
						
						
							
							c++
						
						
						
						
						
						
					 | 
					
						2024-07-16 09:59:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							40db7bbc9a
							
						
					 | 
					
						
						
							
							Merge pull request 'feat:科目三评判优化' (#29) from feat_surenjun into main
						
						
						
						
						
						
						
						Reviewed-on: #29 
						
						
					 | 
					
						2024-07-15 10:09:42 +08:00 | 
					
					
						
						
							
							
							
						
					 |