GitBucket
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java # casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java # casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java |
|---|
|
|
| casic-metering-api/src/main/build/bin/start.sh |
|---|
|
Too large
|
| casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java |
|---|
|
Too large
|
| casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java |
|---|
|
Too large
|
| casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java |
|---|
|
Too large
|
| casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java |
|---|
|
Too large
|
| casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java |
|---|
|
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/customer/CustomerSampleController.java |
|---|
|
Too large
|
| casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerWorkbenchController.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 0 → 100644 |
|---|
|
Too large
|
| casic-metering-common/pom.xml |
|---|
|
Too large
|
| casic-metering-common/src/main/java/com/casic/missiles/enums/AssigneeTypeEnum.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/CurrentSegmentEnum.java 0 → 100644 |
|---|
|
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/HandOutPropertyEnum.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-common/src/main/java/com/casic/missiles/enums/MeasureStatusEnum.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-common/src/main/java/com/casic/missiles/enums/SampleStatusEnum.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java |
|---|
|
Too large
|
| casic-metering-common/src/main/java/com/casic/missiles/utils/CustomXWPFDocumentUtil.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-common/src/main/java/com/casic/missiles/utils/PdfUtil.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-common/src/main/java/com/casic/missiles/utils/PictureUtil.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-common/src/main/java/com/casic/missiles/utils/QRCodeUtil.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveOperateLogMapper.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderListReponseMapper.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOriginalRecordStandardRelationMapper.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CustomerInfoResponseMapper.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterFileMapper.java |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTraceSupplierMapper.java |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainPlanMapper.java |
|---|
|
Too large
|
| casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterTrainStaffMapper.java |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveOperateLogMapper.xml 0 → 100644 |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordEquipmentRelationMapper.xml |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/business/BusinessOriginalRecordStandardRelationMapper.xml 0 → 100644 |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml 0 → 100644 |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/customer/CustomerWorkbenchMapper.xml |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/meter/MeterTraceSupplierMapper.xml |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/meter/MeterTrainStaffMapper.xml |
|---|
|
Too large
|
| casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml |
|---|
|
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/HandOutLabExecutiveDTO.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/MeasureProcessDTO.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/MeasureSendBackDTO.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailRequest.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutListRequest.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutListResponse.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/customer/WorkbenceTrendResponse.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/AllApproveDTO.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalRevokeRequest.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/InApprovedDTO.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListResponse.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListResponse.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanSignInRequest.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignAddRequest.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignDetailResponse.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/dto/system/TemplateAddRequest.java |
|---|
|
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/BusinessEnviromentRecord.java 100644 → 0 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveOperateLog.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrder.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/BusinessOriginalRecordEquipmentRelation.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOriginalRecordStandardRelation.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerInfo.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerUserInfo.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemSign.java |
|---|
|
Too large
|
| casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.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/BusinessEnviromentRecordServiceImpl.java 100644 → 0 |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java 0 → 100644 |
|---|
|
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/BusinessLabExecutiveInfoServiceImpl.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveOperateLogServiceImpl.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.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/customer/CustomerServiceImpl.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerWorkbenchServiceImpl.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/EquipmentStandardApplyServiceImpl.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.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/MeterOrganizeServiceImpl.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.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/MeterTrainLogServiceImpl.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/FlowDefDefServiceImpl.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/IBusinessDispatchService.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnviromentRecordService.java 100644 → 0 |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveOperateLogService.java 0 → 100644 |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOrderService.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerAdviceService.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerWorkbenchService.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/meter/IMeterTrainPlanService.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemFlowFormService.java |
|---|
|
Too large
|
| casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemNoticeService.java |
|---|
|
Too large
|