Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
# Conflicts: # src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteService.java # src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteTaskService.java # src/main/java/com/zhgd/xmgl/modules/checking/service/IXzCheckingRouteToPointService.java # src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDataService.java # src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationDevService.java # src/main/java/com/zhgd/xmgl/modules/concretemixstation/service/IConcreteMixStationMaterialDataService.java # src/main/java/com/zhgd/xmgl/modules/environment/service/IRainAlarmService.java # src/main/java/com/zhgd/xmgl/modules/environment/service/IRainDevService.java # src/main/java/com/zhgd/xmgl/modules/environment/service/IRainRecordService.java # src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java # src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDevService.java # src/main/java/com/zhgd/xmgl/modules/goulipkpm/service/IGouliPkpmConfigService.java # src/main/java/com/zhgd/xmgl/modules/goulipkpm/service/IGouliPkpmModelService.java # src/main/java/com/zhgd/xmgl/modules/goulipkpm/service/ITaskProgressRtService.java # src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketAlarmDataService.java # src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectDataService.java # src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDetectKdeDataService.java # src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDevService.java # src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDisplacementDataService.java # src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionAlarmService.java # src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionDayRecordService.java # src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionDevService.java # src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionFenceService.java # src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionDevService.java # src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveCompactionRecordService.java # src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveDevService.java # src/main/java/com/zhgd/xmgl/modules/pave/service/IPaveRecordService.java # src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationDataService.java # src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationDevService.java # src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationExceedDataService.java # src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationMaterialDataService.java # src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationProdDataService.java # src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineDevService.java # src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageBlockDataService.java # src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageBlockNumberService.java # src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageService.java # src/main/java/com/zhgd/xmgl/modules/rt/service/IRtConstructionDrawService.java # src/main/java/com/zhgd/xmgl/modules/rt/service/IRtDesignChangeContactSheetService.java # src/main/java/com/zhgd/xmgl/modules/rt/service/IRtMaterialOrderService.java # src/main/java/com/zhgd/xmgl/modules/rt/service/IRtNewTechnologiesAndNewProcessService.java # src/main/java/com/zhgd/xmgl/modules/rt/service/IRtProgressPaymentContractService.java # src/main/java/com/zhgd/xmgl/modules/rt/service/IRtRiskInventoryTypeService.java # src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolHistoryService.java # src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java # src/main/java/com/zhgd/xmgl/modules/rt/service/IRtWorkTicketService.java # src/main/java/com/zhgd/xmgl/modules/rt/service/IRtWorkTicketToRiskSecurityLibraryTypeService.java # src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatAlarmService.java # src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java # src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDevService.java # src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatFenceService.java # src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageAlarmService.java # src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java # src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDevService.java # src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageWarnThresholdService.java # src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBeamService.java # src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBeamToProcessService.java # src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldBridgeSectionService.java # src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldMaintainDataService.java # src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldMakeBeamPedestalService.java # src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldProcessService.java # src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldProductionLineService.java # src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldSaveBeamDistrictService.java # src/main/java/com/zhgd/xmgl/modules/smartbeamfield/service/ISmartBeamFieldSaveBeamPedestalService.java # src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutDataService.java # src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutDevService.java # src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutSteelBeamDataService.java # src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionDataService.java # src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionDevService.java # src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionSteelBeamDataService.java # src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevService.java # src/main/java/com/zhgd/xmgl/modules/sprayrt/service/ISprayRtDataService.java # src/main/java/com/zhgd/xmgl/modules/sprayrt/service/ISprayRtDevService.java # src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDataService.java # src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDevService.java # src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationRawMaterialDataService.java # src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationSetDataService.java # src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressContentService.java # src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressMaterialTypeService.java # src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java # src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageBlockDataService.java # src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageBlockNumberService.java # src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageService.java # src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionAlarmService.java # src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDataService.java # src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDayRecordService.java # src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionDevService.java # src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/IVehiclePositionFenceService.java # src/main/java/com/zhgd/xmgl/modules/video/service/IProjectVideoHkVqdService.java # src/main/java/com/zhgd/xmgl/modules/worker/service/ISecurityWorkerCourseInfoService.java # src/main/java/com/zhgd/xmgl/modules/worker/service/IUfaceDevGroupService.java # src/main/java/com/zhgd/xmgl/modules/worker/service/IUfaceDevToGroupService.java # src/main/java/com/zhgd/xmgl/modules/worker/service/IVrSecurityWorkerLoginInfoService.java # src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoDeleteService.java # src/main/java/com/zhgd/xmgl/modules/xz.security/service/IWorkerAccessRecordService.java # src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzMilestoneService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IEducationConfigWeekVideoService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzAiDeductRuleService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzCertificateExpireAlarmRecordService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionVideoFullService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionVideoOnlineService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzNoticeService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzProjectOrgService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzRegistryService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationApplyService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierQualificationRecordService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierRecordService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java # src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java # src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzBlindPlatePlugSafeService.java # src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzGasAnalyzeService.java # src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzGroundSafetService.java # src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzHighJobSafeService.java # src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzHoistSafetyWorkService.java # src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzLimitSpaceSafeService.java # src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzOpenCircuitSafeService.java # src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzSpecialOperationFireSafetyService.java # src/main/java/com/zhgd/xmgl/modules/xz/special/service/IXzTemporaryElectricitySafeService.java
This commit is contained in:
commit
9764cb50e7