yang_shj
							
						 | 
						
							
							
							
							
								
							
								27080888a5
								
							
								
							
						 | 
						
							
							
								
								#发电量接口修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								2753a76c04
								
							
								
							
						 | 
						
							
							
								
								短信多人推送,保存多条记录
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								4b80821bcb
								
							
								
							
						 | 
						
							
							
								
								班组分组查询接口改为用户昵称显示
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								8beb838884
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyGroupServiceImpl.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								42691b77dd
								
							
								
							
						 | 
						
							
							
								
								班组分组查询接口修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								07d46db333
								
							
								
							
						 | 
						
							
							
								
								#数据中断告警修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								80dc0fd36c
								
							
								
							
						 | 
						
							
							
								
								#压测代码回滚
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								da859b8e24
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								d8c3a829ec
								
							
								
							
						 | 
						
							
							
								
								#检修库bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								6c26e704cb
								
							
								
							
						 | 
						
							
							
								
								fix: 应急预案文件按创建时间倒序排列
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								d11dfdfda5
								
							
								
							
						 | 
						
							
							
								
								fix: 班次信息查询添加数据权限
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								c7823e6ee6
								
							
								
							
						 | 
						
							
							
								
								fix: 巡检任务页面添加巡检时长信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								4a3c51c71a
								
							
								
							
						 | 
						
							
							
								
								#区域站点排序
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								d603d49632
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								e1ab65d255
								
							
								
							
						 | 
						
							
							
								
								fix: 解决工作票导出文件信息缺失的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								0159787f0e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								9079e8682b
								
							
								
							
						 | 
						
							
							
								
								#FDP告警保存更改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								fea2e728e2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://192.168.65.152:3000/Jone/hzims-back
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								2dd91c8e0c
								
							
								
							
						 | 
						
							
							
								
								fix: 解决统计月报中无巡检数据的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								1af25cc19d
								
							
								
							
						 | 
						
							
							
								
								#FDP告警保存更改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Jone
							
						 | 
						
							
							
							
							
								
							
								3091f4cad2
								
							
								
							
						 | 
						
							
							
								
								修复电站标准评定的创建用户为空的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								fa3e80efb7
								
							
								
							
						 | 
						
							
							
								
								#检修库bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Jone
							
						 | 
						
							
							
							
							
								
							
								4411799ee1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Jone
							
						 | 
						
							
							
							
							
								
							
								4b394361f6
								
							
								
							
						 | 
						
							
							
								
								修复电站标准评定的创建用户为空的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								8aa91092ad
								
							
								
							
						 | 
						
							
							
								
								#用户展示昵称修改为姓名
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								73bbd2eb85
								
							
								
							
						 | 
						
							
							
								
								#用户展示昵称修改为姓名
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								474e199e28
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod' into prod
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								7175e4e15a
								
							
								
							
						 | 
						
							
							
								
								#用户展示昵称修改为姓名
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								26488999ce
								
							
								
							
						 | 
						
							
							
								
								fix: 解决日常维护任务逾期消息推送报错的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								6554520c19
								
							
								
							
						 | 
						
							
							
								
								fix: 解决站点更新时排序会递增的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								b49f336dc1
								
							
								
							
						 | 
						
							
							
								
								fix: 解决任务月度查询逾期状态异常的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								ef0114cedd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								05a6e3b804
								
							
								
							
						 | 
						
							
							
								
								#检修卡配置修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								8c58f3cbd4
								
							
								
							
						 | 
						
							
							
								
								fix: 解决诊断缺陷的补充信息不支持表情的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								e3f4eea0dd
								
							
								
							
						 | 
						
							
							
								
								fix: 解决出库单导出数据和页面数据不一致的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								2398e085d4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								d02e56502c
								
							
								
							
						 | 
						
							
							
								
								#FDP告警过滤无效数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								e6daf036ec
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod' into prod
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationService.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								5a6e0f3b7f
								
							
								
							
						 | 
						
							
							
								
								fix: 解决视频配置中修改站点排序时导致站点信息丢失的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								03ee59ba43
								
							
								
							
						 | 
						
							
							
								
								fix: 解决水力机械工作票信息缺失的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								a9067135f7
								
							
								
							
						 | 
						
							
							
								
								fix: 解决视频配置中修改站点排序时导致站点信息丢失的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								ccf0bde55c
								
							
								
							
						 | 
						
							
							
								
								fix: 解决视频配置中修改站点排序时导致站点信息丢失的问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c9c5b931d6
								
							
								
							
						 | 
						
							
							
								
								#功率统计
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								88a7706ccb
								
							
								
							
						 | 
						
							
							
								
								#功率24小时统计
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								fc8acac8e9
								
							
								
							
						 | 
						
							
							
								
								#月发电量统一
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								26bf062123
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								90828f3832
								
							
								
							
						 | 
						
							
							
								
								#fdp告警日志打印
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								9c26083485
								
							
								
							
						 | 
						
							
							
								
								班组分组查询接口修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								5478f3ebcb
								
							
								
							
						 | 
						
							
							
								
								资产增加平台要求得注解:Business/Operate
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								eb2824ea38
								
							
								
							
						 | 
						
							
							
								
								资产增加平台要求得注解:Business/Operate
							
							
							
							
							
						 | 
						
							2 years ago |