yang_shj
							
						 | 
						
							
							
							
							
								
							
								48c8600428
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/yang_shj'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								da7707ead3
								
							
								
							
						 | 
						
							
							
								
								#检修流程
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								3035302f2b
								
							
								
							
						 | 
						
							
							
								
								#检修流程
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								1052a8afde
								
							
								
							
						 | 
						
							
							
								
								#检修流程
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								522c15ccbb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c992ed9f04
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								a550f32ad5
								
							
								
							
						 | 
						
							
							
								
								# FDP站点推送接口添加tenantId字段,运维平台删除站点、设备同步删除FDP站点及设备
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								1cedb2b6d2
								
							
								
							
						 | 
						
							
							
								
								# 站点集中监控属性采集点绑定
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								8ef2479103
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								708e1e7e35
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								85902f0701
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/controller/EcologyController.java
#	hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/EcologyFlowStationService.java
#	hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								1e7e83770e
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								60591f9a55
								
							
								
							
						 | 
						
							
							
								
								修改消缺流程代码实体类的相关字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								1ba3e0fec4
								
							
								
							
						 | 
						
							
							
								
								表结构脚本同步脚本
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								14c181ef4c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								37f0a52c97
								
							
								
							
						 | 
						
							
							
								
								# 解决消息APP/WEB多人即时推送feign接口接收问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								407c7c5f52
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								be355ce22c
								
							
								
							
						 | 
						
							
							
								
								修改推送消息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								ce9330e8a8
								
							
								
							
						 | 
						
							
							
								
								# 解决消息APP/WEB多人即时推送feign接口接收问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								bc334eacb6
								
							
								
							
						 | 
						
							
							
								
								# 消息APP/WEB多人即时推送接口(补)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								2555918f16
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								face537c38
								
							
								
							
						 | 
						
							
							
								
								修改操作票
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								77717ce336
								
							
								
							
						 | 
						
							
							
								
								# 消息APP/WEB多人即时推送接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								9c5d4a894b
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c58e669590
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								89c7ea4aec
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								75f744ee1c
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								64f30a971e
								
							
								
							
						 | 
						
							
							
								
								新增DefectProcessServiceImpl,修改工作票,操作票
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								tyty
							
						 | 
						
							
							
							
							
								
							
								2dbbefd330
								
							
								
							
						 | 
						
							
							
								
								修改消缺流程代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								3fa2626a4a
								
							
								
							
						 | 
						
							
							
								
								工作票启动流程返回tiketId给日常维护流程绑定工作票Id
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								551a4c5e40
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								7ef8bb0da7
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								4d34aa08ea
								
							
								
							
						 | 
						
							
							
								
								新建 middle-api
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								122235174c
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								3f76936e76
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								c51f8296de
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								f642818511
								
							
								
							
						 | 
						
							
							
								
								middle 提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								089c487e1c
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								409444e1eb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								7df7086b3a
								
							
								
							
						 | 
						
							
							
								
								processFlow 修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								6536e70b36
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								722818a0af
								
							
								
							
						 | 
						
							
							
								
								processFlow迁移
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								9733af7632
								
							
								
							
						 | 
						
							
							
								
								修改docx模版及新建model
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								baefe25e39
								
							
								
							
						 | 
						
							
							
								
								日常维护流程及操作日志修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								85af1b981a
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								247b54945b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								a30249d92e
								
							
								
							
						 | 
						
							
							
								
								#定时任务抽离
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								段飞宇
							
						 | 
						
							
							
							
							
								
							
								61a5e40708
								
							
								
							
						 | 
						
							
							
								
								修改水力机械工作票
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 tanghaihao
							
						 | 
						
							
							
							
							
								
							
								989a0e5257
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 tanghaihao
							
						 | 
						
							
							
							
							
								
							
								3a081ed0fa
								
							
								
							
						 | 
						
							
							
								
								添加排班计划导出功能
							
							
							
							
							
						 | 
						
							2 years ago |