yang_shj
							
						 | 
						
							
							
							
							
								
							
								4a3c51c71a
								
							
								
							
						 | 
						
							
							
								
								#区域站点排序
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								6554520c19
								
							
								
							
						 | 
						
							
							
								
								fix: 解决站点更新时排序会递增的问题
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								a9067135f7
								
							
								
							
						 | 
						
							
							
								
								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
							
						 | 
						
							
							
							
							
								
							
								c4428935c2
								
							
								
							
						 | 
						
							
							
								
								#操作票统计bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								37e73990fb
								
							
								
							
						 | 
						
							
							
								
								#限制水位
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								843134665e
								
							
								
							
						 | 
						
							
							
								
								#乌兹别克功率数据处理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								c0ddfbbfa2
								
							
								
							
						 | 
						
							
							
								
								#光伏数据bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								b82a556d2f
								
							
								
							
						 | 
						
							
							
								
								#首页风电修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								1ae015b46b
								
							
								
							
						 | 
						
							
							
								
								#首页关联发电量设备名称显示
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								b788368e36
								
							
								
							
						 | 
						
							
							
								
								#演示大屏降雨修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								dd36c40ff3
								
							
								
							
						 | 
						
							
							
								
								#演示大屏
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								1f35ad9916
								
							
								
							
						 | 
						
							
							
								
								#演示大屏
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								9b9facd6ac
								
							
								
							
						 | 
						
							
							
								
								#演示平台接口、30天发电量修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								54f4184f2b
								
							
								
							
						 | 
						
							
							
								
								#演示平台接口、30天发电量修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								2b7c69c76d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod' into prod
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								5c7f9e7383
								
							
								
							
						 | 
						
							
							
								
								#演示平台接口、30天发电量修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								cebc81fc56
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod' into prod
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								2186702b8f
								
							
								
							
						 | 
						
							
							
								
								# 根据站点编号、时间段查询降雨量接口开发
							
							
							
							
							
							
							
							(cherry picked from commit 5618b6c177) 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								a9c0788343
								
							
								
							
						 | 
						
							
							
								
								#演示平台接口、30天发电量修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								2488de80e9
								
							
								
							
						 | 
						
							
							
								
								#演示平台接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								0152c5791c
								
							
								
							
						 | 
						
							
							
								
								#增加Json转换
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								29abfb9009
								
							
								
							
						 | 
						
							
							
								
								#增加Json转换
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								d815997ffd
								
							
								
							
						 | 
						
							
							
								
								#运行月报告曲线命名bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								a9e8e5245d
								
							
								
							
						 | 
						
							
							
								
								#站点筛选告警无效问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								eae00f3d20
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod' into prod
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								292de22340
								
							
								
							
						 | 
						
							
							
								
								# HZA100C参数下发bug解决
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								4162e85641
								
							
								
							
						 | 
						
							
							
								
								#水电站单位修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								cb0556cfb2
								
							
								
							
						 | 
						
							
							
								
								#日常维护定时任务注释
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								41e6209bcb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod' into prod
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								89ec14c572
								
							
								
							
						 | 
						
							
							
								
								#充电桩修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								c9545a2f46
								
							
								
							
						 | 
						
							
							
								
								# aspose-words-15.8.0-jdk16.jar提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								a2682234ba
								
							
								
							
						 | 
						
							
							
								
								# HZA100C参数下发功能取实时数据时爆空指针问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								5688addac8
								
							
								
							
						 | 
						
							
							
								
								# 参数下发剔除掉非参数的属性
							
							
							
							
							
							
							
							# 上次报文时间格式化
(cherry picked from commit cad0af0c31) 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								e076a3ded0
								
							
								
							
						 | 
						
							
							
								
								# HZ100C参数下发添加描述、保留小数位字段
							
							
							
							
							
							
							
							(cherry picked from commit 2f98d7aeaa) 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								683fe8bfd6
								
							
								
							
						 | 
						
							
							
								
								#HZ100C修改
							
							
							
							
							
							
							
							(cherry picked from commit 87a9a720b6) 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								41b2137b95
								
							
								
							
						 | 
						
							
							
								
								# HZ100C参数下发与备份功能
							
							
							
							
							
							
							
							(cherry picked from commit 2f8c0a2786) 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								6ccd1c95b3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod' into prod
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								73f9098acb
								
							
								
							
						 | 
						
							
							
								
								# HZ100C参数下发添加描述、保留小数位字段
							
							
							
							
							
							
							
							(cherry picked from commit 2f98d7aeaa) 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								682b4fe327
								
							
								
							
						 | 
						
							
							
								
								#HZ100C修改
							
							
							
							
							
							
							
							(cherry picked from commit 87a9a720b6) 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 Jone
							
						 | 
						
							
							
							
							
								
							
								2b2503364f
								
							
								
							
						 | 
						
							
							
								
								交接班线上bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								e393ae6f33
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod' into prod
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								6d9f4697b3
								
							
								
							
						 | 
						
							
							
								
								#单位属性去重
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								76da44caf7
								
							
								
							
						 | 
						
							
							
								
								交接班接口弃用
							
							
							
							
							
						 | 
						
							2 years ago |