 yang_shj
|
c348460059
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/fegin/IMessageClient.java
# hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMessagePushRecordService.java
|
2 years ago |
|
yang_shj
|
2d127b84b4
|
#微信消息推送
|
2 years ago |
 haungxing
|
1722c001c0
|
# 短信即时推送接口开发(api)
|
2 years ago |
|
haungxing
|
7abb47d30c
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
haungxing
|
0be8c21f5b
|
# 短信即时推送接口开发
|
2 years ago |
tyty
|
35420bd188
|
修改智能诊断接口异常抛出
|
2 years ago |
|
yang_shj
|
386ab0899e
|
#近3年发电量bug修复
|
2 years ago |
|
tyty
|
4aff9e5429
|
导出水电站月报bug修改
|
2 years ago |
|
yang_shj
|
750bc2cd10
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
yang_shj
|
e23e969fb3
|
#数据关联增加分页
|
2 years ago |
|
tyty
|
1086da6d3b
|
库存台账，导入提示bug修复
|
2 years ago |
|
yang_shj
|
7fb5c6a981
|
#代码检查修复
|
2 years ago |
|
yang_shj
|
601587574c
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
yang_shj
|
dd3f928ac1
|
#代码检查修复
|
2 years ago |
|
yang_shj
|
4389d2b472
|
Merge remote-tracking branch 'origin/prod'
# Conflicts:
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/CentralMonitorServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/HomeController.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationController.java
|
2 years ago |
|
yang_shj
|
0526a53ccf
|
#黔东南问题修复
|
2 years ago |
|
tyty
|
95dade2247
|
新增库存台账-模糊查询
|
2 years ago |
|
yang_shj
|
f09b74cc2c
|
#数据关联
|
2 years ago |
|
yang_shj
|
ae90b37047
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
yang_shj
|
099e778623
|
#数据关联
|
2 years ago |
|
tyty
|
19a4b9fffb
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
tyty
|
ecb961a2dc
|
新增库存台账模糊查询
|
2 years ago |
 tanghaihao
|
ba1180661b
|
删掉一个没用到的getEmInfoTreeByEmCode远程调用方法
|
2 years ago |
|
tanghaihao
|
223eb21b48
|
获取设备信息机组最大值添加是否删除字段逻辑
|
2 years ago |
|
yang_shj
|
0e276c3f62
|
Merge remote-tracking branch 'origin/prod' into prod
|
2 years ago |
|
yang_shj
|
2669e18f3b
|
#数据关联
|
2 years ago |
|
yang_shj
|
ff35881b5d
|
Merge remote-tracking branch 'origin/prod'
|
2 years ago |
|
yang_shj
|
4de24541a8
|
#数据关联
|
2 years ago |
|
tyty
|
088a573ab2
|
水电站月报修改
|
2 years ago |
|
yang_shj
|
4216714506
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java
|
2 years ago |
|
yang_shj
|
199366015c
|
#代码优化修改
|
2 years ago |
|
段飞宇
|
f2127fdb16
|
过滤两票统计合格数量
|
2 years ago |
|
tyty
|
30f807340f
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
tyty
|
feb67734ae
|
水电站月报修改
|
2 years ago |
|
段飞宇
|
75168758ac
|
修改ticket脚本
|
2 years ago |
|
段飞宇
|
3106299cdf
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
段飞宇
|
3f049061b8
|
修改middle模块
|
2 years ago |
|
tyty
|
a55174094e
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
tyty
|
045a8bad31
|
库存推送预警代码修改
|
2 years ago |
|
段飞宇
|
fd17bbf485
|
提交middle脚本
|
2 years ago |
|
yang_shj
|
f14a5f108e
|
#日常维护任务派发定时任务
|
2 years ago |
|
yang_shj
|
af6c0a78c9
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
yang_shj
|
fae4de653e
|
#日常维护任务派发定时任务
|
2 years ago |
|
tyty
|
ff4391f403
|
库存推送预警代码修改
|
2 years ago |
|
段飞宇
|
6c6d2d639b
|
提交middle脚本
|
2 years ago |
|
yang_shj
|
5093ecfba2
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
yang_shj
|
4badc160ff
|
#代码同步
|
2 years ago |
|
段飞宇
|
62f4d8af4d
|
提交middle脚本
|
2 years ago |
|
段飞宇
|
32870c81f2
|
提交ticket脚本
|
2 years ago |
|
yang_shj
|
e37ec4bd30
|
Merge remote-tracking branch 'origin/prod'
# Conflicts:
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/ecology/service/impl/EcologyFlowStationServiceImpl.java
|
2 years ago |
