haungxing
							
						 | 
						
							
							
							
							
								
							
								1b4e7c6d4e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								0bacf3efe1
								
							
								
							
						 | 
						
							
							
								
								# 设备巡检内容批量更新接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								6b022b9da4
								
							
								
							
						 | 
						
							
							
								
								两票生成月报生成修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								d9323a1cc0
								
							
								
							
						 | 
						
							
							
								
								# contentEntity添加name的筛选方式
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								39dc80e072
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								0917b88829
								
							
								
							
						 | 
						
							
							
								
								# 根据设备项目获取巡检项目以及巡检内容接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								f369ee6a52
								
							
								
							
						 | 
						
							
							
								
								#风电
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								f8addf2929
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								69eb41b08e
								
							
								
							
						 | 
						
							
							
								
								#风电
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								850bec042e
								
							
								
							
						 | 
						
							
							
								
								修复消缺流程bug-消缺消息推送
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								030d3c69f6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								f62c1a8224
								
							
								
							
						 | 
						
							
							
								
								#风电
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								bfca190b86
								
							
								
							
						 | 
						
							
							
								
								修复消缺流程bug-消缺消息推送
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								2f676597ae
								
							
								
							
						 | 
						
							
							
								
								两票生成月报列表与下载
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								8b39ab9aee
								
							
								
							
						 | 
						
							
							
								
								修复消缺流程bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								45f2bfe221
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								418c1c1023
								
							
								
							
						 | 
						
							
							
								
								# 站点类型推送FDP配置接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								dbb75908db
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								06a3760844
								
							
								
							
						 | 
						
							
							
								
								#设备排序
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								94d5da7c9e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								7dac2613c3
								
							
								
							
						 | 
						
							
							
								
								修复消缺流程bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								ebf69d182d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								0dc66e9f8b
								
							
								
							
						 | 
						
							
							
								
								# 巡检内容定义查询接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								5442896d15
								
							
								
							
						 | 
						
							
							
								
								pom文件修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								6841ab8f4c
								
							
								
							
						 | 
						
							
							
								
								#智能生产排序
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								0214541df1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								225912f6f9
								
							
								
							
						 | 
						
							
							
								
								修复消缺流程bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								407fdd6c36
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								a296d23e83
								
							
								
							
						 | 
						
							
							
								
								#报表导出修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								05a1a64d7d
								
							
								
							
						 | 
						
							
							
								
								两票统计分析生成功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								4ef691ad9e
								
							
								
							
						 | 
						
							
							
								
								pon文件修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								a975cafa50
								
							
								
							
						 | 
						
							
							
								
								#报表导出修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								e8c99dca9e
								
							
								
							
						 | 
						
							
							
								
								#pom修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								e4814dee89
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								b16d91a017
								
							
								
							
						 | 
						
							
							
								
								# 巡检内容新增时编码自动生成
							
							
							
							
							
							
							
							# feign接口新建巡检项目巡检类型自动填入 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								bc262210b3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								ef89b5ac0b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod'
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/scheduled/ScheduledCreateTask.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								50b3340088
								
							
								
							
						 | 
						
							
							
								
								# 巡检定义脚本修改、巡检内容实体类修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								a3d43d1ea1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								8865a8ecd6
								
							
								
							
						 | 
						
							
							
								
								# 巡检定义巡检内容list查询条件将IDS由String变更为List<Long>
							
							
							
							
							
							
							
							# pom文件依赖问题修改 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								32ad7b8ff6
								
							
								
							
						 | 
						
							
							
								
								智能诊断-数据溯源
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								c067dd503a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								c178f4c648
								
							
								
							
						 | 
						
							
							
								
								# 添加设备巡检内容批量更新的feign接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								e1008623e5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								1c87a81957
								
							
								
							
						 | 
						
							
							
								
								#检修流程
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								2d032a5d39
								
							
								
							
						 | 
						
							
							
								
								排班计划导出,入参格式修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								7a758088c4
								
							
								
							
						 | 
						
							
							
								
								消缺管理-数据溯源版本修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								2175cf59fe
								
							
								
							
						 | 
						
							
							
								
								# getRealId接口添加获取设备实例属性绑定采集点名称
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								8fc2c0fb7b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								09475ecf10
								
							
								
							
						 | 
						
							
							
								
								# 站点管理新增是否国外字段
							
							
							
							
							
						 | 
						
							2 years ago |