haungxing
							
						 | 
						
							
							
							
							
								
							
								1e7d82f0e6
								
							
								
							
						 | 
						
							
							
								
								fix:operational脚本整理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								52f28478f1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/hzims-middle/src/main/resources/db/2.0.0.sql 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								da7920e48f
								
							
								
							
						 | 
						
							
							
								
								#初始sql
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								e2e7d42a06
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								f7cdb6a29b
								
							
								
							
						 | 
						
							
							
								
								operation脚本提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								ae259b39d3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								7be4c5e8ea
								
							
								
							
						 | 
						
							
							
								
								fix:ticket脚本整理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								f57377eb51
								
							
								
							
						 | 
						
							
							
								
								operation脚本提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								a725068a82
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								c98c1e5ceb
								
							
								
							
						 | 
						
							
							
								
								fix:inspect/middle脚本整理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								45d400b583
								
							
								
							
						 | 
						
							
							
								
								#ticket初始sql
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								f6a409c177
								
							
								
							
						 | 
						
							
							
								
								#operational初始sql
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								50a98f18aa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								dd18972a6c
								
							
								
							
						 | 
						
							
							
								
								#inspect初始sql
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								d5bc17b1b5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								a512a0af41
								
							
								
							
						 | 
						
							
							
								
								fix:operational-1.0.0.sql脚本整理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								ce03042bc5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								83ee7970a9
								
							
								
							
						 | 
						
							
							
								
								工作票sql脚本提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								57389e7be2
								
							
								
							
						 | 
						
							
							
								
								fix:优化工作流消息消费逻辑
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								f18cd82966
								
							
								
							
						 | 
						
							
							
								
								update: sql脚本文件更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								856858c002
								
							
								
							
						 | 
						
							
							
								
								设备档案bug修复-ysj
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								8a547eb58c
								
							
								
							
						 | 
						
							
							
								
								订正:月报统计模板
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								fae369e6d1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Jone
							
						 | 
						
							
							
							
							
								
							
								b0d0d63386
								
							
								
							
						 | 
						
							
							
								
								提交配置文件,更换git地址初始化代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								3286221d72
								
							
								
							
						 | 
						
							
							
								
								订正:月报统计模板
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								8615d92749
								
							
								
							
						 | 
						
							
							
								
								订正:水电站月报统计导出返回数据异常
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								9c55964fa8
								
							
								
							
						 | 
						
							
							
								
								订正:告警配置字段赋值问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								1387e472ae
								
							
								
							
						 | 
						
							
							
								
								订正:首页查询天气报错
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								7cfccce652
								
							
								
							
						 | 
						
							
							
								
								新增:水电站运行月报表结构
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								ec92334beb
								
							
								
							
						 | 
						
							
							
								
								#运行月报告修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								7103827474
								
							
								
							
						 | 
						
							
							
								
								add: 视频回放接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								9280a03e9c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								ae464f50b1
								
							
								
							
						 | 
						
							
							
								
								调整:soe告警字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								6fef653b07
								
							
								
							
						 | 
						
							
							
								
								# 修复站点编辑修改机构排序问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								893eb8aeec
								
							
								
							
						 | 
						
							
							
								
								# 视频配置多平台接入
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								19237795c2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								7f3e0cd59c
								
							
								
							
						 | 
						
							
							
								
								# 消息中心app即时推送逻辑修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								1ff1afc2a9
								
							
								
							
						 | 
						
							
							
								
								修正:规则告警格式
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								1ef2d1e4df
								
							
								
							
						 | 
						
							
							
								
								#配电比支持小数
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								a2a2eb540f
								
							
								
							
						 | 
						
							
							
								
								update: 作业区域管理页面添加安全负责人名称和分管领导名称字段信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								8fa660d19c
								
							
								
							
						 | 
						
							
							
								
								update: 作业区域管理页面添加安全负责人名称和分管领导名称字段信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								18b805d7ad
								
							
								
							
						 | 
						
							
							
								
								#关联值班功率单位问题修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								6ccdade06b
								
							
								
							
						 | 
						
							
							
								
								增加告警数据过滤
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								81bdd74f09
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								c92b1d16d5
								
							
								
							
						 | 
						
							
							
								
								增加告警数据过滤
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								5884ddfecd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://192.168.65.152:3000/Jone/hzims-back
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								3c9d6ce3c5
								
							
								
							
						 | 
						
							
							
								
								update: safeproduct添加日志注解
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								f5a4a31564
								
							
								
							
						 | 
						
							
							
								
								修正巡检查询逻辑
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								a4b3f02c89
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod' into prod
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c9e8c4c524
								
							
								
							
						 | 
						
							
							
								
								#水位质量判断
							
							
							
							
							
						 | 
						
							2 years ago |