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 a3dc7d4affd6f8f1fb08595004bf7fd8653bbe1a 2 parents 715708b + 8be500a xiezhuangz authored on 14 Mar 2023

Patch

Unified Split

Showing 7 changed files

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

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

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

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

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/BusinessLabExecutiveInfoServiceImpl.java

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

Show line notes below