• KeYong's avatar
    Merge branch 'develop_station' into developer · 3109496d
    KeYong authored
    # Conflicts:
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java
    #	amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml
    3109496d
Name
Last commit
Last update
..
AlarmMapper.xml Loading commit data...
AnalysisReportLogMapper.xml Loading commit data...
AnalysisReportMonthMapper.xml Loading commit data...
AnalysisReportSummaryMapper.xml Loading commit data...
AreaMapper.xml Loading commit data...
BadManagementMapper.xml Loading commit data...
Building.xml Loading commit data...
BuildingAuditMapper.xml Loading commit data...
CarConfMapper.xml Loading commit data...
CarInfoMapper.xml Loading commit data...
CarMapper.xml Loading commit data...
CarPropertyMapper.xml Loading commit data...
CommonTreeMapper.xml Loading commit data...
CompanyBusinessMapper.xml Loading commit data...
CompanyMapper.xml Loading commit data...
CompanyQualificationMapper.xml Loading commit data...
CompanyQualificationsMapper.xml Loading commit data...
ConfirmAlarmMapper.xml Loading commit data...
DeviceServicingMapper.xml Loading commit data...
DistrictsMapper.xml Loading commit data...
EqDynamicFormColumnMapper.xml Loading commit data...
EqDynamicFormGroupMapper.xml Loading commit data...
EqDynamicFormInstanceMapper.xml Loading commit data...
EqSourceFileMapper.xml Loading commit data...
EquPropertyMapper.xml Loading commit data...
EquipmentAccountMapper.xml Loading commit data...
EquipmentAlarmReportDayMapper.xml Loading commit data...
EquipmentCategoryMapper.xml Loading commit data...
EquipmentDetailMapper.xml Loading commit data...
EquipmentIndexMapper.xml Loading commit data...
EquipmentManageMapper.xml Loading commit data...
EquipmentMapper.xml Loading commit data...
EquipmentOnCarMapper.xml Loading commit data...
EquipmentPointMapper.xml Loading commit data...
EquipmentQrcodeMapper.xml Loading commit data...
EquipmentSpecificAlarmLogMapper.xml Loading commit data...
EquipmentSpecificAlarmMapper.xml Loading commit data...
EquipmentSpecificIndexMapper.xml Loading commit data...
EquipmentSpecificMapper.xml Loading commit data...
EquipmentSpecificRelationMapper.xml Loading commit data...
EquipmentStandardMapper.xml Loading commit data...
EquipmentStandardRelationsMapper.xml Loading commit data...
EquipmentStandardWarningMapper.xml Loading commit data...
EquipmentSystemSourceStatisticsMapper.xml Loading commit data...
ExtinguishantOnCarMapper.xml Loading commit data...
FireFightingSystemMapper.xml Loading commit data...
FormGroupColumnMapper.xml Loading commit data...
FormGroupMapper.xml Loading commit data...
FormInstanceMapper.xml Loading commit data...
IllegalAttachmentMapper.xml Loading commit data...
IllegalMapper.xml Loading commit data...
IndustryMapper.xml Loading commit data...
JournalMapper.xml Loading commit data...
LochusEquipmentMapper.xml Loading commit data...
LochusStandardMapper.xml Loading commit data...
MaintainResultMapper.xml Loading commit data...
MaintainWithinSevenDaysMapper.xml Loading commit data...
MaintenanceResourceDataMapper.xml Loading commit data...
MaintenanceResourceMapper.xml Loading commit data...
MaintianQueryMapper.xml Loading commit data...
ManufacturerInfoMapper.xml Loading commit data...
MonitorEventMapper.xml Loading commit data...
MonitorViewVideoMapper.xml Loading commit data...
NoticeMapper.xml Loading commit data...
RiskSource.xml Loading commit data...
RiskSourceTreeMapper.xml Loading commit data...
ScrapDetailMapper.xml Loading commit data...
ScrapMapper.xml Loading commit data...
SearchMapper.xml Loading commit data...
SignalClassifyMapper.xml Loading commit data...
SourceSceneMapper.xml Loading commit data...
StockBillDetailMapper.xml Loading commit data...
StockBillMapper.xml Loading commit data...
StockDetailMapper.xml Loading commit data...
StockMapper.xml Loading commit data...
StockWarningRuleMapper.xml Loading commit data...
SystemDicMapper.xml Loading commit data...
TaskMapper.xml Loading commit data...
TaskPaycheckMapper.xml Loading commit data...
TaskPersonFileMapper.xml Loading commit data...
TaskPersonMapper.xml Loading commit data...
TaskTechDocumentMapper.xml Loading commit data...
TechDocumentAttachmentMapper.xml Loading commit data...
TechDocumentMapper.xml Loading commit data...
UnitMapper.xml Loading commit data...
UploadFileMapper.xml Loading commit data...
VideoEquipmentSpecificMapper.xml Loading commit data...
VideoMapper.xml Loading commit data...
WarehouseMapper.xml Loading commit data...
WarehouseStructureMapper.xml Loading commit data...
WastageBillDetailMapper.xml Loading commit data...
WastageBillMapper.xml Loading commit data...