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 | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								7fa83216ad
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								8baca8a9f0
								
							
								
							
						 | 
						
							
							
								
								#水位质量判断
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								42332e9882
								
							
								
							
						 | 
						
							
							
								
								推送告警消息邮件
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								00719f8797
								
							
								
							
						 | 
						
							
							
								
								update: 车辆/特种设备模块推送消息逻辑修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c7bee39006
								
							
								
							
						 | 
						
							
							
								
								#日常维护代码还原
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								6a423c0763
								
							
								
							
						 | 
						
							
							
								
								fix: 日常维护列表查询添加数据缓存
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								ea995f164c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								6372ca2209
								
							
								
							
						 | 
						
							
							
								
								增加巡检任务人员姓名字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								8791a2740f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								d344b23e0f
								
							
								
							
						 | 
						
							
							
								
								#邮件推送
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								66f2ce8df0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								2ff1e14ce5
								
							
								
							
						 | 
						
							
							
								
								优化智能诊断列表页查询速度
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								a66ae07913
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod' into prod
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								e16c48b2e8
								
							
								
							
						 | 
						
							
							
								
								# SDK升级至5.1.1.RELEASE
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								d2762da891
								
							
								
							
						 | 
						
							
							
								
								#邮件推送
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c55e68271e
								
							
								
							
						 | 
						
							
							
								
								#集中监控告警处理机构筛选
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								7f10d3b933
								
							
								
							
						 | 
						
							
							
								
								#集中监控告警处理机构筛选
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								f93b9200a4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 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 |