Browse code 版本冲突 dev release
commit ee9bbd4d929c31a7e650dd931b9535e341ef90e4 2 parents 6431eac + 6a037b5 chaizhuang authored on 30 Mar 2023

Showing 34 changed files

• casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java
• casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java
• casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java
• casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
• casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
• casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
• casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
• casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
• casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectMapper.java
• casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
• casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml
• casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourcerInfoMapper.xml
• casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
• casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectCheckSaveOrUpdateRequest.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectListRequest.java
• casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java
• casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerAbility.java
• casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
• casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerUserInfo.java
• casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectService.java
• casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProjectApplyEventPostProcessor.java
• casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProjectCheckEventPostProcessor.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectApplyController.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceProjectCheckController.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerAbilityController.java

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java

Ignore Space Show notes View casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java

Ignore Space Show notes View casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOutsourceProjectMapper.java

Ignore Space Show notes View casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml

Ignore Space Show notes View casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourceProjectMapper.xml

Ignore Space Show notes View casic-metering-dao/src/main/resources/mapper/business/BusinessOutsourcerInfoMapper.xml

Ignore Space Show notes View casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListRequest.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApprovalListResponse.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectCheckSaveOrUpdateRequest.java 0 → 100644

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectListRequest.java 0 → 100644

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourceProject.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerAbility.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerUserInfo.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfo.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceProjectService.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProjectApplyEventPostProcessor.java 0 → 100644

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/OutsourceProjectCheckEventPostProcessor.java 0 → 100644

Show line notes below