Merge remote-tracking branch 'origin/dev' into dev

Fork: 0

wangpeng / casic-metering

Browse code Merge remote-tracking branch 'origin/dev' into dev dev release
commit 1b57f9f53555dcbd18f5202d767268c7e31946d1 2 parents f344e48 + 213814b xiezhuangz authored on 1 Mar 2023

Patch

Unified Split

Showing 42 changed files

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

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

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

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

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

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

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

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

Ignore Space Show notes View casic-metering-api/src/main/resources/config/application.yml

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

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java

Ignore Space Show notes View casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessDealRecordMapper.java 0 → 100644

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

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

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

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

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

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListRequest.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/meter/FileApprovalListResponse.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TraceSupplierApprovalListResponse.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListRequest.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanApprovalListResponse.java

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

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

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

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

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

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.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/BusinessOrderServiceImpl.java

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

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

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

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

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

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

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

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

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

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

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

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

Show line notes below