tyty
							
						 | 
						
							
							
							
							
								
							
								d13de88d25
								
							
								
							
						 | 
						
							
							
								
								集中监控智能诊断代码修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								8848537254
								
							
								
							
						 | 
						
							
							
								
								# 设备树接口改造
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								b1c16c577c
								
							
								
							
						 | 
						
							
							
								
								#天气修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								fa018e299e
								
							
								
							
						 | 
						
							
							
								
								修改定时任务时间
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								22023006be
								
							
								
							
						 | 
						
							
							
								
								更新脚本
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								1039dfb9ce
								
							
								
							
						 | 
						
							
							
								
								更新脚本
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								ab8aa79143
								
							
								
							
						 | 
						
							
							
								
								脚本跟新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								913215e561
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								00f369472d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod'
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/HydropowerUnitVo.java
#	hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/constant/TicketProcessConstant.java
#	hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java
#	hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								f61883984d
								
							
								
							
						 | 
						
							
							
								
								# APP消息推送线程池修改
							
							
							
							
							
							
							
							# 设备信息懒加载树接口调整
# 消息推送消息中心列表去除数据权限 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								ec64e7e8c2
								
							
								
							
						 | 
						
							
							
								
								#故障消息推送
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								f7e019b907
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								e279c4682a
								
							
								
							
						 | 
						
							
							
								
								水电站月报代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								84e662f089
								
							
								
							
						 | 
						
							
							
								
								查询通讯告警的最后一小时的运行数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								d54c0c284b
								
							
								
							
						 | 
						
							
							
								
								查询通讯告警的最后一小时的运行数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								d2a37de507
								
							
								
							
						 | 
						
							
							
								
								查询通讯告警的最后一小时的运行数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								61640d9deb
								
							
								
							
						 | 
						
							
							
								
								添加国家字典数据接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								e7284804aa
								
							
								
							
						 | 
						
							
							
								
								#首页统计数据修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								f4b951195f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								33dfcc0791
								
							
								
							
						 | 
						
							
							
								
								#风电接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Jone
							
						 | 
						
							
							
							
							
								
							
								9336fa3ca5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Jone
							
						 | 
						
							
							
							
							
								
							
								847cdeb15a
								
							
								
							
						 | 
						
							
							
								
								添加jfreechart测试代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								aa57627f4f
								
							
								
							
						 | 
						
							
							
								
								#仓库管理修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								5d9dcac540
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								aeee1bf576
								
							
								
							
						 | 
						
							
							
								
								#仓库管理修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								16e3e57c4d
								
							
								
							
						 | 
						
							
							
								
								水电站月报代码提交demo
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								92a58b4c2f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								1dece6bb0d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								36a541193a
								
							
								
							
						 | 
						
							
							
								
								#仓库管理修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								1005019840
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 tanghaihao
							
						 | 
						
							
							
							
							
								
							
								4388e45a64
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 tanghaihao
							
						 | 
						
							
							
							
							
								
							
								e407f34389
								
							
								
							
						 | 
						
							
							
								
								导入设备的时候巡检项目机构需要和设备相同
							
							
							
							
							
							
							
							设备答题结束绑定模型标识逻辑调整 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								eae7059715
								
							
								
							
						 | 
						
							
							
								
								# 巡检对象设备树-机构层级接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								51fa0536e7
								
							
								
							
						 | 
						
							
							
								
								# 巡检对象懒加载树接口开发
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								169bfa1c02
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								31e38b644b
								
							
								
							
						 | 
						
							
							
								
								# 接站FDP站点推送bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								53705a9f1c
								
							
								
							
						 | 
						
							
							
								
								修改工作票错票及废票
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								dbdc1b2a55
								
							
								
							
						 | 
						
							
							
								
								修改值班突发事件bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								2b61488103
								
							
								
							
						 | 
						
							
							
								
								水电站月报导出功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								59dd3f6036
								
							
								
							
						 | 
						
							
							
								
								新增日志统计排序规律
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								ba0e8b52d0
								
							
								
							
						 | 
						
							
							
								
								新增日志统计排序规律
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								83c525bee7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								03eee141b9
								
							
								
							
						 | 
						
							
							
								
								# 巡检项目选择树接口修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								106edede40
								
							
								
							
						 | 
						
							
							
								
								#告警消息推送修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								edd288e2f9
								
							
								
							
						 | 
						
							
							
								
								修改操作日志查询
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								72b0e02fda
								
							
								
							
						 | 
						
							
							
								
								修改设备信息日志注解
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								237d6d60a4
								
							
								
							
						 | 
						
							
							
								
								# 交接班流程改造
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								cbe8a620ac
								
							
								
							
						 | 
						
							
							
								
								修改值班配置日志注解
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								dd601290a9
								
							
								
							
						 | 
						
							
							
								
								修改数据填报日志注解
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								799ea94782
								
							
								
							
						 | 
						
							
							
								
								修改消息管理日志注解
							
							
							
							
							
						 | 
						
							2 years ago |