zhangyue
							
						 | 
						
							
							
							
							
								
							
								f5f001d7bb
								
							
								
							
						 | 
						
							
							
								
								连接oracle
							
							
							
							
							
						 | 
						
							2024-01-17 09:54:58 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangyue
							
						 | 
						
							
							
							
							
								
							
								ca28cfaf66
								
							
								
							
						 | 
						
							
							
								
								配置文件增加redis
							
							
							
							
							
						 | 
						
							2024-01-16 09:02:09 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangyue
							
						 | 
						
							
							
							
							
								
							
								b06a93f468
								
							
								
							
						 | 
						
							
							
								
								初始化
							
							
							
							
							
						 | 
						
							2024-01-15 18:28:47 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangyue
							
						 | 
						
							
							
							
							
								
							
								4a13c01caf
								
							
								
							
						 | 
						
							
							
								
								测试删除
							
							
							
							
							
						 | 
						
							2024-01-10 13:32:46 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangyue
							
						 | 
						
							
							
							
							
								
							
								905576b68b
								
							
								
							
						 | 
						
							
							
								
								视频获取
							
							
							
							
							
						 | 
						
							2024-01-09 19:20:45 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangyue
							
						 | 
						
							
							
							
							
								
							
								25077ea9a6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'cmt1.0' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java
#	src/main/java/com/zcloud/util/ReturnMap.java
#	src/main/resources/application-dev.properties
#	src/main/resources/application-local.properties
#	src/main/resources/application-master.properties
#	src/main/resources/application.properties
#	src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml
#	src/main/resources/mybatis/datasource/gatemachine/GateMachineMapper.xml
#	src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml 
							
						 | 
						
							2024-01-08 15:43:52 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-7VLMG81\Administrator
							
						 | 
						
							
							
							
							
								
							
								84245b934c
								
							
								
							
						 | 
						
							
							
								
								地图人员定位
							
							
							
							
							
						 | 
						
							2024-01-08 14:17:14 +08:00 | 
						
					
				
					
						
							
							
								
								 zhangyue
							
						 | 
						
							
							
							
							
								
							
								df4f35d1fb
								
							
								
							
						 | 
						
							
							
								
								门口门禁
							
							
							
							
							
						 | 
						
							2024-01-08 10:30:17 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								331e779e11
								
							
								
							
						 | 
						
							
							
								
								add: 数据同步相关aop功能迁移
							
							
							
							
							
						 | 
						
							2023-12-17 15:48:56 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								7073565e0b
								
							
								
							
						 | 
						
							
							
								
								add: 沧州矿石代码同步加地图版本
							
							
							
							
							
						 | 
						
							2023-12-17 15:29:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhaoyu
							
						 | 
						
							
							
							
							
								
							
								e0d63a1bcb
								
							
								
							
						 | 
						
							
							
								
								部署31配置文件修改
							
							
							
							
							
						 | 
						
							2023-12-12 10:23:44 +08:00 | 
						
					
				
					
						
							
							
								 
								limingyu
							
						 | 
						
							
							
							
							
								
							
								72cb39f096
								
							
								
							
						 | 
						
							
							
								
								曹妃甸动火作业搬到港务局4
							
							
							
							
							
						 | 
						
							2023-12-05 14:13:49 +08:00 | 
						
					
				
					
						
							
							
								 
								limingyu
							
						 | 
						
							
							
							
							
								
							
								335d1e04fd
								
							
								
							
						 | 
						
							
							
								
								曹妃甸动火作业搬到港务局3
							
							
							
							
							
						 | 
						
							2023-12-05 13:45:52 +08:00 | 
						
					
				
					
						
							
							
								
								 dearlin
							
						 | 
						
							
							
							
							
								
							
								8f1868e6cd
								
							
								
							
						 | 
						
							
							
								
								改造配置文件
							
							
							
							
							
						 | 
						
							2023-11-08 10:24:18 +08:00 |