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 | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								06ad6c9d76
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								37589c4773
								
							
								
							
						 | 
						
							
							
								
								值班增加值班长名称和人员名称
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								adde99a21c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								cc1fe1eda5
								
							
								
							
						 | 
						
							
							
								
								update: 演练、会议、培训记录页面添加单位筛选
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								747b81ca44
								
							
								
							
						 | 
						
							
							
								
								值班增加值班长名称和人员名称
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c4428935c2
								
							
								
							
						 | 
						
							
							
								
								#操作票统计bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								5282c490aa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								af820cfb4e
								
							
								
							
						 | 
						
							
							
								
								#告警处理记录
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								8ea4543c28
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								73f991e487
								
							
								
							
						 | 
						
							
							
								
								培训记录-考试填报代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								30fff98af0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								a0e3084978
								
							
								
							
						 | 
						
							
							
								
								# 日常维护任务月度统计逻辑修改、用户名添加
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								96ddb48341
								
							
								
							
						 | 
						
							
							
								
								集中监控提示优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								486f0fbe10
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								6ce757c8de
								
							
								
							
						 | 
						
							
							
								
								增加:会议记录、演练记录、培训记录
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								de6d4fd25d
								
							
								
							
						 | 
						
							
							
								
								# 巡检机器人数据看板
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								bc47af3a26
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								146f751f1a
								
							
								
							
						 | 
						
							
							
								
								考试记录增加查询页面
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								79789867bb
								
							
								
							
						 | 
						
							
							
								
								#检修增加日志打印
							
							
							
							
							
						 | 
						
							2 years ago |