hs
							
						 | 
						
							
							
							
							
								
							
								ccb9eb4f55
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pages/home/home_page.dart
#	pubspec.lock
#	pubspec.yaml 
							
						 | 
						
							2025-07-24 09:43:29 +08:00 | 
						
					
				
					
						
							
							
								 
								hs
							
						 | 
						
							
							
							
							
								
							
								87f5620000
								
							
								
							
						 | 
						
							
							
								
								特殊作业部分
							
							
							
							
							
						 | 
						
							2025-07-24 09:38:06 +08:00 | 
						
					
				
					
						
							
							
								
								 xufei
							
						 | 
						
							
							
							
							
								
							
								fe6ab0fa03
								
							
								
							
						 | 
						
							
							
								
								2025.7.23 人员,工作安排,风险分布,法律法规差详情和预览
							
							
							
							
							
						 | 
						
							2025-07-23 20:14:38 +08:00 | 
						
					
				
					
						
							
							
								 
								hs
							
						 | 
						
							
							
							
							
								
							
								942da64c4a
								
							
								
							
						 | 
						
							
							
								
								学习园地模块完成
							
							
							
							
							
						 | 
						
							2025-07-22 13:34:34 +08:00 | 
						
					
				
					
						
							
							
								
								 xufei
							
						 | 
						
							
							
							
							
								
							
								74891e0384
								
							
								
							
						 | 
						
							
							
								
								2025.7.18 隐患记录正在写
							
							
							
							
							
						 | 
						
							2025-07-18 17:33:37 +08:00 | 
						
					
				
					
						
							
							
								 
								hs
							
						 | 
						
							
							
							
							
								
							
								97db3dec46
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
							
							
							# Conflicts:
#	lib/http/ApiService.dart
#	lib/pages/home/study/face_ecognition_page.dart 
							
						 | 
						
							2025-07-18 17:17:19 +08:00 | 
						
					
				
					
						
							
							
								 
								hs
							
						 | 
						
							
							
							
							
								
							
								94489cf18e
								
							
								
							
						 | 
						
							
							
								
								学习园地-人脸视频逻辑
							
							
							
							
							
						 | 
						
							2025-07-18 17:13:38 +08:00 | 
						
					
				
					
						
							
							
								
								 xufei
							
						 | 
						
							
							
							
							
								
							
								af81885441
								
							
								
							
						 | 
						
							
							
								
								2025.7.17 离岗完成
							
							
							
							
							
						 | 
						
							2025-07-17 17:58:04 +08:00 | 
						
					
				
					
						
							
							
								 
								hs
							
						 | 
						
							
							
							
							
								
							
								7d7d262522
								
							
								
							
						 | 
						
							
							
								
								..
							
							
							
							
							
						 | 
						
							2025-07-17 16:19:19 +08:00 | 
						
					
				
					
						
							
							
								 
								hs
							
						 | 
						
							
							
							
							
								
							
								acb1b59ebb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
							
							
							# Conflicts:
#	lib/http/ApiService.dart
#	pubspec.yaml 
							
						 | 
						
							2025-07-17 16:18:35 +08:00 | 
						
					
				
					
						
							
							
								 
								hs
							
						 | 
						
							
							
							
							
								
							
								1aeb4610b7
								
							
								
							
						 | 
						
							
							
								
								人脸、学习部分逻辑
							
							
							
							
							
						 | 
						
							2025-07-17 16:10:46 +08:00 | 
						
					
				
					
						
							
							
								
								 xufei
							
						 | 
						
							
							
							
							
								
							
								5791ecc47f
								
							
								
							
						 | 
						
							
							
								
								2025.7.16 通知完成
							
							
							
							
							
						 | 
						
							2025-07-16 18:07:10 +08:00 | 
						
					
				
					
						
							
							
								 
								hs
							
						 | 
						
							
							
							
							
								
							
								668aeeb828
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main'
							
							
							
							
							
						 | 
						
							2025-07-16 08:38:24 +08:00 | 
						
					
				
					
						
							
							
								
								 xufei
							
						 | 
						
							
							
							
							
								
							
								102b5b7011
								
							
								
							
						 | 
						
							
							
								
								2025.7.16 备份
							
							
							
							
							
						 | 
						
							2025-07-16 08:38:10 +08:00 | 
						
					
				
					
						
							
							
								 
								hs
							
						 | 
						
							
							
							
							
								
							
								c5352625c6
								
							
								
							
						 | 
						
							
							
								
								学习园地
							
							
							
							
							
						 | 
						
							2025-07-16 08:37:08 +08:00 | 
						
					
				
					
						
							
							
								 
								hs
							
						 | 
						
							
							
							
							
								
							
								a68c1448c6
								
							
								
							
						 | 
						
							
							
								
								接口封装、登录
							
							
							
							
							
						 | 
						
							2025-07-15 08:32:50 +08:00 |