zhaoyu
							
						 | 
						
							
							
							
							
								
							
								6b7d0dabe3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/czks1.0' into czks1.0
							
							
							
							
							
						 | 
						
							2024-02-03 18:46:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								720047671c
								
							
								
							
						 | 
						
							
							
								
								特殊处置审核不传附件
							
							
							
							
							
						 | 
						
							2024-02-03 18:45:59 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								0da519a9e3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/czks1.0' into czks1.0
							
							
							
							
							
						 | 
						
							2024-02-03 15:56:21 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								fbd277ae60
								
							
								
							
						 | 
						
							
							
								
								闸机功能
							
							
							
							
							
						 | 
						
							2024-02-03 15:55:18 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								6cd4575ae2
								
							
								
							
						 | 
						
							
							
								
								APP打回bug修复
							
							
							
							
							
						 | 
						
							2024-02-03 09:28:16 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								7992101af8
								
							
								
							
						 | 
						
							
							
								
								删除风险单元提示信息修正
							
							
							
							
							
						 | 
						
							2024-02-01 11:02:25 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								ea8dd8e1a6
								
							
								
							
						 | 
						
							
							
								
								删除辨识部位提示信息修正
							
							
							
							
							
						 | 
						
							2024-02-01 10:47:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								f0f9d01c04
								
							
								
							
						 | 
						
							
							
								
								监管端地图八项作业处理
							
							
							
							
							
						 | 
						
							2024-01-31 10:20:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								6e79d931e4
								
							
								
							
						 | 
						
							
							
								
								安全环保检查bug处理
							
							
							
							
							
						 | 
						
							2024-01-29 15:21:33 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								a3e794bb31
								
							
								
							
						 | 
						
							
							
								
								门禁闸机功能
							
							
							
							
							
						 | 
						
							2024-01-25 11:20:21 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								de49f0fa9c
								
							
								
							
						 | 
						
							
							
								
								闸机出入记录功能
							
							
							
							
							
						 | 
						
							2024-01-24 17:20:24 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								9e0f486228
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/czks1.0' into czks1.0
							
							
							
							
							
						 | 
						
							2024-01-23 18:05:39 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								cfcd363e36
								
							
								
							
						 | 
						
							
							
								
								闸机出入记录功能
							
							
							
							
							
						 | 
						
							2024-01-23 18:05:30 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								d8b0f384e2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/czks1.0' into czks1.0
							
							
							
							
							
						 | 
						
							2024-01-23 11:31:14 +08:00 | 
						
					
				
					
						
							
							
								
								 liujun
							
						 | 
						
							
							
							
							
								
							
								dc86b0eb24
								
							
								
							
						 | 
						
							
							
								
								学习园地、教育培训功能数据同步功能
							
							
							
							
							
						 | 
						
							2024-01-23 11:30:53 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								faac07b1b7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/czks1.0' into czks1.0
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/zcloud/controller/gatemachine/GateCarIOController.java 
							
						 | 
						
							2024-01-23 09:32:50 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								d3cb7a2857
								
							
								
							
						 | 
						
							
							
								
								门禁进出记录
							
							
							
							
							
						 | 
						
							2024-01-23 09:32:02 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								5fd5380385
								
							
								
							
						 | 
						
							
							
								
								闸机出入记录注释添加
							
							
							
							
							
						 | 
						
							2024-01-23 08:57:14 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								36b64c11b1
								
							
								
							
						 | 
						
							
							
								
								门口门禁记录
							
							
							
							
							
						 | 
						
							2024-01-19 16:57:32 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								63cc479f4f
								
							
								
							
						 | 
						
							
							
								
								门口门禁记录
							
							
							
							
							
						 | 
						
							2024-01-19 16:56:47 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								34f27ebfd4
								
							
								
							
						 | 
						
							
							
								
								门口门禁记录
							
							
							
							
							
						 | 
						
							2024-01-19 15:39:45 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								dc28d0a652
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/czks1.0' into czks1.0
							
							
							
							
							
						 | 
						
							2024-01-19 09:27:36 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								19a797640d
								
							
								
							
						 | 
						
							
							
								
								体系文件批量上传
							
							
							
							
							
						 | 
						
							2024-01-19 09:27:10 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								d92c164b15
								
							
								
							
						 | 
						
							
							
								
								地图上展示八项作业相关
							
							
							
							
							
						 | 
						
							2024-01-19 08:53:29 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								8ddd4b1c63
								
							
								
							
						 | 
						
							
							
								
								体系文件批量上传
							
							
							
							
							
						 | 
						
							2024-01-19 08:48:17 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								3d79dc0c92
								
							
								
							
						 | 
						
							
							
								
								体系文件批量上传
							
							
							
							
							
						 | 
						
							2024-01-19 08:46:40 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								095be8743d
								
							
								
							
						 | 
						
							
							
								
								体系文件批量上传
							
							
							
							
							
						 | 
						
							2024-01-18 18:00:04 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								4962d4be11
								
							
								
							
						 | 
						
							
							
								
								风险点单元删除的ids数组追加
							
							
							
							
							
						 | 
						
							2024-01-18 17:06:44 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								456e48a8ba
								
							
								
							
						 | 
						
							
							
								
								风险点单元删除的ids数组追加
							
							
							
							
							
						 | 
						
							2024-01-18 17:00:57 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								bc92e6b594
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/czks1.0' into czks1.0
							
							
							
							
							
						 | 
						
							2024-01-18 15:50:10 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								9986f6e3ea
								
							
								
							
						 | 
						
							
							
								
								部门查询
							
							
							
							
							
						 | 
						
							2024-01-18 15:50:02 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								77830f3e83
								
							
								
							
						 | 
						
							
							
								
								八项作业,摄像头,体系文件
							
							
							
							
							
						 | 
						
							2024-01-18 15:21:11 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								5678f4451d
								
							
								
							
						 | 
						
							
							
								
								八项作业不显示扎点
							
							
							
							
							
						 | 
						
							2024-01-18 15:11:33 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								8883f58af7
								
							
								
							
						 | 
						
							
							
								
								体系文件下载地址
							
							
							
							
							
						 | 
						
							2024-01-18 14:36:21 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								aa5a53137d
								
							
								
							
						 | 
						
							
							
								
								体系文件同步
							
							
							
							
							
						 | 
						
							2024-01-18 14:29:45 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								95d325c6a5
								
							
								
							
						 | 
						
							
							
								
								港股对接沧州矿石地图代码
							
							
							
							
							
						 | 
						
							2024-01-17 16:01:16 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								1d87206d40
								
							
								
							
						 | 
						
							
							
								
								港股调试摄像头
							
							
							
							
							
						 | 
						
							2024-01-17 13:54:06 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								aa617724f1
								
							
								
							
						 | 
						
							
							
								
								承诺书bug
							
							
							
							
							
						 | 
						
							2024-01-16 15:10:34 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								163f532db9
								
							
								
							
						 | 
						
							
							
								
								CORPINFO_ID查询条件
							
							
							
							
							
							
							
							追加 
							
						 | 
						
							2024-01-16 12:00:35 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								57bd46e784
								
							
								
							
						 | 
						
							
							
								
								CORPINFO_ID查询条件
							
							
							
							
							
							
							
							追加 
							
						 | 
						
							2024-01-15 17:44:16 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								a512986859
								
							
								
							
						 | 
						
							
							
								
								地图上重点工程图层
							
							
							
							
							
						 | 
						
							2024-01-15 16:14:03 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								66ed85388f
								
							
								
							
						 | 
						
							
							
								
								港务局代码合并
							
							
							
							
							
						 | 
						
							2024-01-15 15:10:01 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								575b27f705
								
							
								
							
						 | 
						
							
							
								
								地图代码重构
							
							
							
							
							
						 | 
						
							2024-01-15 11:56:44 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								8439ee07b2
								
							
								
							
						 | 
						
							
							
								
								人员定位测试
							
							
							
							
							
						 | 
						
							2024-01-15 11:10:09 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								10ae5aabea
								
							
								
							
						 | 
						
							
							
								
								dockData
							
							
							
							
							
							
							
							@DockAnnotation
CARDNO
追加 
							
						 | 
						
							2024-01-12 17:02:35 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								1539163515
								
							
								
							
						 | 
						
							
							
								
								增加隐患数量
							
							
							
							
							
						 | 
						
							2024-01-11 18:02:12 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								5f53def846
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/czks1.0' into czks1.0
							
							
							
							
							
						 | 
						
							2024-01-11 16:39:14 +08:00 | 
						
					
				
					
						
							
							
								 
								liulixin
							
						 | 
						
							
							
							
							
								
							
								2ab3f6c70e
								
							
								
							
						 | 
						
							
							
								
								dockData
							
							
							
							
							
							
							
							@DockAnnotation
追加 
							
						 | 
						
							2024-01-11 16:38:56 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								147d92c329
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev-2024年1月8日' into dev-2024年1月8日
							
							
							
							
							
						 | 
						
							2024-01-11 15:49:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								722aaee5e0
								
							
								
							
						 | 
						
							
							
								
								动火搜索问题
							
							
							
							
							
						 | 
						
							2024-01-11 15:49:30 +08:00 |