• suhuiguang's avatar
    Merge branch 'developer' into develop_privage · bbef2b1e
    suhuiguang authored
    # Conflicts:
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireTeamController.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireTeamServiceImpl.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
    #	amos-boot-system-equip/src/main/resources/application.properties
    #	amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
    bbef2b1e
Name
Last commit
Last update
..
AbstractBaseController.java Loading commit data...
AccessRecordingController.java Loading commit data...
AlarmController.java Loading commit data...
AnalysisReportLogController.java Loading commit data...
AreaController.java Loading commit data...
BuildingAuditController.java Loading commit data...
BuildingController.java Loading commit data...
BuildingVideoController.java Loading commit data...
CarConfController.java Loading commit data...
CarController.java Loading commit data...
CarInfoController.java Loading commit data...
CarPropertyController.java Loading commit data...
CommonController.java Loading commit data...
ConfirmAlarmController.java Loading commit data...
DeviceServicingController.java Loading commit data...
DownloadController.java Loading commit data...
DynamicFormController.java Loading commit data...
EquPropertyController.java Loading commit data...
EquipDynamicFormGroupController.java Loading commit data...
EquipSourceFileController.java Loading commit data...
EquipmentAccountController.java Loading commit data...
EquipmentAlarmController.java Loading commit data...
EquipmentCategoryController.java Loading commit data...
EquipmentController.java Loading commit data...
EquipmentDetailController.java Loading commit data...
EquipmentIndexController.java Loading commit data...
EquipmentManageController.java Loading commit data...
EquipmentOnCarController.java Loading commit data...
EquipmentPointController.java Loading commit data...
EquipmentQrcodeController.java Loading commit data...
EquipmentSpecificAlarmController.java Loading commit data...
EquipmentSpecificController.java Loading commit data...
EquipmentSpecificRelationController.java Loading commit data...
EquipmentStandardController.java Loading commit data...
EquipmentStandardRelationsController.java Loading commit data...
EquipmentStandardWarningController.java Loading commit data...
ExcelController.java Loading commit data...
ExtinguishantOnCarController.java Loading commit data...
FireFightingSystemController.java Loading commit data...
FireResourceController.java Loading commit data...
IndustryController.java Loading commit data...
JournalController.java Loading commit data...
LochusEquipmentController.java Loading commit data...
LochusStandardController.java Loading commit data...
MainIotMonitorController.java Loading commit data...
MaintainController.java Loading commit data...
MaintainDetailController.java Loading commit data...
MaintainResultController.java Loading commit data...
MaintainWithinSevenDaysController.java Loading commit data...
MaintenanceResourceController.java Loading commit data...
MaintenanceResourceDataController.java Loading commit data...
MaintianQueryController.java Loading commit data...
ManufacturerInfoController.java Loading commit data...
MonitorEventController.java Loading commit data...
MonitorViewController.java Loading commit data...
NoticeController.java Loading commit data...
RepairController.java Loading commit data...
RepairDetailController.java Loading commit data...
RightsideBarController.java Loading commit data...
RiskSourceController.java Loading commit data...
RiskSourceSceneController.java Loading commit data...
ScrapController.java Loading commit data...
ScrapDetailController.java Loading commit data...
SearchController.java Loading commit data...
StatisticsController.java Loading commit data...
StockBillController.java Loading commit data...
StockBillDetailController.java Loading commit data...
StockController.java Loading commit data...
StockDetailController.java Loading commit data...
StockWarningRuleController.java Loading commit data...
SystemDicController.java Loading commit data...
TopographyController.java Loading commit data...
UnitController.java Loading commit data...
UploadFileController.java Loading commit data...
UserController.java Loading commit data...
VideoController.java Loading commit data...
View3dController.java Loading commit data...
VisitorRecordingController.java Loading commit data...
WarehouseController.java Loading commit data...
WarehouseStructureController.java Loading commit data...
WastageBillController.java Loading commit data...
WastageBillDetailController.java Loading commit data...