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
|
10 months ago |
| .. |
|
assets
|
update: sql脚本文件更新
|
10 months ago |
|
equipment
|
fix:middle、equipment初始化脚本优化
|
10 months ago |
|
hzims-alarm
|
#初始sql
|
10 months ago |
|
hzims-basic
|
update: sql脚本文件更新
|
10 months ago |
|
hzims-middle
|
fix:middle、equipment初始化脚本优化
|
10 months ago |
|
hzims-scheduled
|
Merge remote-tracking branch 'origin/prod'
|
10 months ago |
|
inspect
|
#离线巡检&检修列表查询
|
10 months ago |
|
message
|
update: sql脚本文件更新
|
10 months ago |
|
operational
|
Merge remote-tracking branch 'origin/prod'
|
10 months ago |
|
safeproduct
|
fix:危险源列表所属机构修改为非必填项
|
10 months ago |
|
spare
|
按阿里巴巴规约修改代码
|
2 years ago |
|
ticket
|
update: sql脚本更新
|
10 months ago |
|
topvision
|
提交配置文件，更换git地址初始化代码
|
10 months ago |
|
weather
|
update: sql脚本更新
|
10 months ago |
|
hzims-service.iml
|
提交配置文件，更换git地址初始化代码
|
10 months ago |
|
pom.xml
|
基本模块提交，新增人员证书管理
|
1 year ago |
