You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
yang_shj
7e29255efa
Merge remote-tracking branch 'origin/prod'
# Conflicts:
# hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/emParam/entity/ParamBackupsDetailEntity.java
# hzims-service/equipment/src/main/resources/db/1.0.1.sql
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/WindMapper.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/WindService.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/fill/impl/WindServiceImpl.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/DataService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/controller/AbnormalAlarmController.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/controller/HzimsDataController.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/service/HzimsDataService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/data/service/impl/HzimsDataServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectStatisticsWrapper.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskSchedule.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
# pom.xml
|
7 months ago |
| .. |
|
access
|
#代码清理
|
9 months ago |
|
census
|
#水电站点发电量数据关联详情
|
11 months ago |
|
config
|
#首页区域地图修改
|
9 months ago |
|
data/vo
|
#限制水位
|
8 months ago |
|
defect
|
#检修卡配置修改
|
8 months ago |
|
duty
|
值班增加值班长名称和人员名称
|
8 months ago |
|
ecology
|
#黔东南修改
|
1 year ago |
|
feign
|
# 线下工作票流程预览接口修改
|
1 year ago |
|
fill
|
#其它填报修改
|
9 months ago |
|
home/wind
|
#降雨量统计修改
|
9 months ago |
|
main
|
Merge remote-tracking branch 'origin/prod'
|
7 months ago |
|
maintenance
|
# 机构班次树优化
|
9 months ago |
|
report
|
#代码清理
|
9 months ago |
|
screen
|
代码初始化
|
2 years ago |
|
station
|
# 站点建站逻辑修改
|
9 months ago |
|
ticket
|
开启工作票
|
2 years ago |
|
vRView
|
#代码清理
|
9 months ago |
|
video
|
add: 视频回放接口
|
8 months ago |
|
OperationalConstants.java
|
#代码清理
|
9 months ago |
