Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java |
---|
casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java 0 → 100644 |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java 0 → 100644 |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java 0 → 100644 |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java 0 → 100644 |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java 0 → 100644 |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerUserInfoController.java 0 → 100644 |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java 0 → 100644 |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java 0 → 100644 |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterCertificateController.java |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java |
---|
Too large
|
casic-metering-api/src/main/java/com/casic/missiles/controller/system/PoiController.java |
---|
Too large
|
casic-metering-api/src/main/resources/config/application.yml |
---|
Too large
|
casic-metering-common/pom.xml |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/config/ReminderNodeConfig.java 0 → 100644 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/enums/business/CertificateTypeEnum.java |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CertificationExpireStatusEnum.java |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/CommonExcelListener.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/NotifyEventPostProcessor.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/TaskCreatedListener.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificatePrintEventPostProcessor.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateReportEventPostProcessor.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentApplyEventPostProcessor.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentLeaseEventPostProcessor.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentManagingEventPostProcessor.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupportEventPostProcessor.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/FilePrintRegisterUtils.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataGeneric.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileDataSupport.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/PrintFileRegister.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/CalibrationPrintFileData.java 100644 → 0 |
---|
Too large
|
casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/register/data/TestReportPrintFileData.java 100644 → 0 |
---|
Too large
|
casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceCertificateMapper.java 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectMapper.java 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectSampleRelationMapper.java 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourcerAbilityMapper.java 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourcerInfoMapper.java 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourcerUserInfoMapper.java 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveInfoMapper.java 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveStaffRelationMapper.java 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/java/com/casic/missiles/mapper/sys/PrintFileRegisterMapper.java |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceCertificateMapper.xml 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectSampleRelationMapper.xml 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourcerAbilityMapper.xml 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourcerInfoMapper.xml 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourcerUserInfoMapper.xml 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.xml 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml 0 → 100644 |
---|
Too large
|
casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveStaffRelationMapper.xml 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/FilePrintRegister.java |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeSampleListResponse.java |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleDTO.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OrderSampleResponseDTO.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectSaveResponse.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerAbilityListRequest.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerApprovalListRequest.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerApprovalListResponse.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerListRequest.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerSaveResponse.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourcerUserListRequest.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListRequest.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceCertificate.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProjectSampleRelation.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerAbility.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerUserInfo.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java 0 → 100644 |
---|
Too large
|
casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTraceSupplier.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/IBaseApprovalService.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectSampleRelationServiceImpl.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerAbilityServiceImpl.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerInfoServiceImpl.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourcerUserInfoServiceImpl.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceCertificateService.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectSampleRelationService.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectService.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourcerAbilityService.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourcerInfoService.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourcerUserInfoService.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoService.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveLogService.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveStaffRelationService.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/CommonExcelListener.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/NotifyEventPostProcessor.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/CounterSignListener.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/TaskCreatedListener.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificatePrintEventPostProcessor.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/CertificateReportEventPostProcessor.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentApplyEventPostProcessor.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentLeaseEventPostProcessor.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentManagingEventPostProcessor.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentSupportEventPostProcessor.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileDataGeneric.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileDataSupport.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileRegister.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/data/CalibrationPrintFileData.java 0 → 100644 |
---|
Too large
|
casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/data/TestReportPrintFileData.java 0 → 100644 |
---|
Too large
|