• KeYong's avatar
    Merge branch 'develop_dl_3.7.0.9_huaian' into develop_dl · f1ca521e
    KeYong authored
    # Conflicts:
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/ControlScreenController.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPlanTaskService.java
    #	amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
    #	amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml
    f1ca521e
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...
BigScreenController.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...
ConfigureController.java Loading commit data...
ConfirmAlarmController.java Loading commit data...
Coordinate.java Loading commit data...
DCenterController.java Loading commit data...
DeviceServicingController.java Loading commit data...
DownloadController.java Loading commit data...
DynamicFormController.java Loading commit data...
EmergencyController.java Loading commit data...
EquPropertyController.java Loading commit data...
EquipDynamicFormGroupController.java Loading commit data...
EquipInformationCardController.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...
EquipmentInfoOnPlanController.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...
EquipmentSpecificAlarmLogController.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...
FireAutoSysManageReportController.java Loading commit data...
FireFightingSystemController.java Loading commit data...
FirePatrolReportController.java Loading commit data...
FireResourceController.java Loading commit data...
FireResourceSupervisionController.java Loading commit data...
FormGroupColumnController.java Loading commit data...
FormInstanceController.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...
OrgUserController.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...
SignalClassifyController.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...
SupervisionConfigureController.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...
VideoImportantEquipmentController.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...
WlCarMileageController.java Loading commit data...