Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev

Fork: 0

wangpeng / casic-metering

Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev Conflicts: casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java dev release
commit d9fde1ef9c314ffc3d5e8a4c5aaffc47cfb132ca 2 parents ae560ef + 33adc7a casic_zt authored on 10 Mar 2023

Browse code

Conflicts:
casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificateReportController.java
casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java
casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessCertificateReportService.java

dev release

commit d9fde1ef9c314ffc3d5e8a4c5aaffc47cfb132ca

2 parents ae560ef + 33adc7a

casic_zt authored on 10 Mar 2023

Patch

Unified Split

Showing 19 changed files

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

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.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/equipment/EquipmentFixedAssetsController.java

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

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java

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

Show notes View casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java 100644 → 0

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

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

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

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

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

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

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.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/IBusinessDispatchServiceImpl.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/customer/CustomerSampleService.java

Show line notes below