liwen
							
						 | 
						
							
							
							
							
								
							
								fbbe12ced1
								
							
								
							
						 | 
						
							
							
								
								update: 删除无用代码
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								31e98b4a72
								
							
								
							
						 | 
						
							
							
								
								fix: 解决演练、培训、卫生月度统计数据异常的问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								b7e4fb1027
								
							
								
							
						 | 
						
							
							
								
								fix: 解决卫生模板查询失败的问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								af6f156048
								
							
								
							
						 | 
						
							
							
								
								update: 车检模板
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								a0645f08a5
								
							
								
							
						 | 
						
							
							
								
								add: 车检记录模板
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								5bfe349416
								
							
								
							
						 | 
						
							
							
								
								#站点管理、集中监控增加下限水位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								9faf4865e9
								
							
								
							
						 | 
						
							
							
								
								#站点管理、集中监控增加下限水位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								f645f1e98a
								
							
								
							
						 | 
						
							
							
								
								#站点管理、集中监控增加下限水位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								98330e808a
								
							
								
							
						 | 
						
							
							
								
								#站点管理、集中监控增加下限水位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								375d93a412
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								28668c8925
								
							
								
							
						 | 
						
							
							
								
								#用户反馈更新sql
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								693132b15b
								
							
								
							
						 | 
						
							
							
								
								fix: 解决演练、培训、卫生月度统计数据异常的问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								904bbd2eb1
								
							
								
							
						 | 
						
							
							
								
								fix: 解决卫生模板查询失败的问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								350c494c18
								
							
								
							
						 | 
						
							
							
								
								update: 车检模板
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								4e6a3e28f4
								
							
								
							
						 | 
						
							
							
								
								fix:系统异常时格式化返回的答案
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								305b8098b1
								
							
								
							
						 | 
						
							
							
								
								fix:choose类型函数解析逻辑变更
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								2b44d23ad1
								
							
								
							
						 | 
						
							
							
								
								修正:告警处理记录中的处理人字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								0c70821df3
								
							
								
							
						 | 
						
							
							
								
								add:暂存
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								f5014ae61c
								
							
								
							
						 | 
						
							
							
								
								修正:微信公众号告警类型枚举类更换
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								be9f869e46
								
							
								
							
						 | 
						
							
							
								
								修正:统计月报发电量数据,日常维护数据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								37afd450b9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								08fc6c93bf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								24bc529965
								
							
								
							
						 | 
						
							
							
								
								add:暂存
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								343984a9a7
								
							
								
							
						 | 
						
							
							
								
								#用户反馈更新sql
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								dc981fd47b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								0bfd2c892f
								
							
								
							
						 | 
						
							
							
								
								add: 车检记录模板
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								191a7b07d1
								
							
								
							
						 | 
						
							
							
								
								#用户反馈
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								2bf4711d4d
								
							
								
							
						 | 
						
							
							
								
								#用户反馈
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								9504396e74
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/safeproduct/src/main/resources/db/2.0.1.sql 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								40b225ed48
								
							
								
							
						 | 
						
							
							
								
								#用户反馈
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								494257283a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506'
							
							
							
							
							
							
							
							# Conflicts:
#	hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java
#	hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/mapper/AlarmHandleMapper.xml
#	hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmHandleService.java
#	hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/MessageServiceImpl.java
#	hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java
#	hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneTemplateService.java
#	hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java
#	hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneTemplateServiceImpl.java
#	hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java
#	hzims-service/safeproduct/src/main/resources/db/2.0.1.sql
#	pom.xml 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								c414f10227
								
							
								
							
						 | 
						
							
							
								
								add:历史数据查询
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								90c1e5b5d5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								5b0cb49670
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								d8f6d9aa26
								
							
								
							
						 | 
						
							
							
								
								#用户反馈
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								4762cdefcb
								
							
								
							
						 | 
						
							
							
								
								修正:统计月报发电量小数点保留后两位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								658c08d014
								
							
								
							
						 | 
						
							
							
								
								修正:统计月报发电量小数点保留后两位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								150670b0cf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://175.6.40.68:8081/Jone/hzims-back
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								aee95af2b6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 ty
							
						 | 
						
							
							
							
							
								
							
								c8f667a827
								
							
								
							
						 | 
						
							
							
								
								修正:告警处理记录中的处理人字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								e0b766cd3b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 haungxing
							
						 | 
						
							
							
							
							
								
							
								0060d8446c
								
							
								
							
						 | 
						
							
							
								
								add:历史数据查询
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 yang_shj
							
						 | 
						
							
							
							
							
								
							
								af8b1c4389
								
							
								
							
						 | 
						
							
							
								
								#水电站月报发电量小数问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								03ecbafe44
								
							
								
							
						 | 
						
							
							
								
								update: 卫生自查模板详情表字段修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								da0c28467a
								
							
								
							
						 | 
						
							
							
								
								update: 考试记录及格分设置
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								3b2fe257ec
								
							
								
							
						 | 
						
							
							
								
								update: 卫生自查模板详情表字段修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								b601dd36e1
								
							
								
							
						 | 
						
							
							
								
								update: 卫生自查更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								9d5461c38f
								
							
								
							
						 | 
						
							
							
								
								update: 卫生自查模块
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								bee5de26b8
								
							
								
							
						 | 
						
							
							
								
								update: 卫生自查模板
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								
								 liwen
							
						 | 
						
							
							
							
							
								
							
								52ffb6052a
								
							
								
							
						 | 
						
							
							
								
								add: 车检记录模板
							
							
							
							
							
						 | 
						
							1 year ago |