tyty
|
3f3c89eace
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
tyty
|
37d5a63e98
|
修正水电站月报统计
|
1 year ago |
 yang_shj
|
6bb972a7ec
|
#黔东南修改
|
1 year ago |
|
tyty
|
d13f93d3f7
|
修正智能诊断统计任务展示
|
1 year ago |
|
tyty
|
e4b07e8667
|
修正水电站月报导出bug
|
1 year ago |
 Jone
|
a26bfc6054
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# hzims-service/inspect/pom.xml
|
1 year ago |
|
Jone
|
f8627ef96c
|
更新平台jar到5.0.1 release版本
|
1 year ago |
 tanghaihao
|
fec50a9202
|
导入设备信息的时候从定义中获取模型标识填充
|
1 year ago |
|
yang_shj
|
0ede2cb0b7
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
yang_shj
|
61cbd2adcf
|
#黔东南修改
|
1 year ago |
 haungxing
|
2538c0df15
|
# 巡检内容定义删除时做设备定义绑定内容定义时无法删除的限制
# 设备定义列表bug解决
|
1 year ago |
|
yang_shj
|
7d58dc285b
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
yang_shj
|
af77249d06
|
#风电计划发电量修改
|
1 year ago |
|
haungxing
|
671fb42e79
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
haungxing
|
8055c39fdb
|
# 巡检消息推送内容修改
# APP消息推送规则修改
# 巡检内容定义名称搜索模糊查询修改
|
1 year ago |
|
Jone
|
6d78c9615f
|
修改pom，并提交bug
|
1 year ago |
|
Jone
|
88035ac4b9
|
提交最新版pom
|
1 year ago |
|
Jone
|
a5c85cec05
|
删掉无用代码
|
1 year ago |
|
yang_shj
|
079cd1e504
|
#风电计划发电量修改
|
1 year ago |
|
haungxing
|
10ebcb0c37
|
# 微信消息推送service bug
|
1 year ago |
|
Jone
|
0be69c9366
|
提交分支
|
1 year ago |
|
haungxing
|
104fc12eb8
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
haungxing
|
a4597462d3
|
# 站点删除功能bug修改
|
1 year ago |
|
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
|
1 year ago |
|
yang_shj
|
2d127b84b4
|
#微信消息推送
|
1 year ago |
|
haungxing
|
1722c001c0
|
# 短信即时推送接口开发(api)
|
1 year ago |
|
haungxing
|
7abb47d30c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
haungxing
|
0be8c21f5b
|
# 短信即时推送接口开发
|
1 year ago |
|
tyty
|
35420bd188
|
修改智能诊断接口异常抛出
|
1 year ago |
|
yang_shj
|
386ab0899e
|
#近3年发电量bug修复
|
1 year ago |
|
tyty
|
4aff9e5429
|
导出水电站月报bug修改
|
1 year ago |
|
yang_shj
|
750bc2cd10
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
yang_shj
|
e23e969fb3
|
#数据关联增加分页
|
1 year ago |
|
tyty
|
1086da6d3b
|
库存台账，导入提示bug修复
|
1 year ago |
|
yang_shj
|
7fb5c6a981
|
#代码检查修复
|
1 year ago |
|
yang_shj
|
601587574c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
yang_shj
|
dd3f928ac1
|
#代码检查修复
|
1 year 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
|
1 year ago |
|
yang_shj
|
0526a53ccf
|
#黔东南问题修复
|
1 year ago |
|
tyty
|
95dade2247
|
新增库存台账-模糊查询
|
1 year ago |
|
yang_shj
|
f09b74cc2c
|
#数据关联
|
1 year ago |
|
yang_shj
|
ae90b37047
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
yang_shj
|
099e778623
|
#数据关联
|
1 year ago |
|
tyty
|
19a4b9fffb
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
tyty
|
ecb961a2dc
|
新增库存台账模糊查询
|
1 year ago |
|
tanghaihao
|
ba1180661b
|
删掉一个没用到的getEmInfoTreeByEmCode远程调用方法
|
1 year ago |
|
tanghaihao
|
223eb21b48
|
获取设备信息机组最大值添加是否删除字段逻辑
|
1 year ago |
|
yang_shj
|
0e276c3f62
|
Merge remote-tracking branch 'origin/prod' into prod
|
1 year ago |
|
yang_shj
|
2669e18f3b
|
#数据关联
|
1 year ago |
|
yang_shj
|
ff35881b5d
|
Merge remote-tracking branch 'origin/prod'
|
1 year ago |
