Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering-eqpt-xichang into dev # Conflicts: # casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java dev
commit ad78066fa0c033c892954af8f28804ba4b963475 2 parents fe4081c + e94f91d zhangyingjie authored on 19 Jan 2024

Showing 18 changed files

• casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java
• casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractOrderController.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ElectronicImage.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/FilePrintRegister.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/minio/ImageConfig.java
• casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleFieldConfig.java
• casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java
• casic-metering-service/pom.xml
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java
• casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
• casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/ImageTool.java
• casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
• casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java
• casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java
• casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/PdfUtils.java
• casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractOrderService.java

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

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

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

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

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

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

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

Ignore Space Show notes View casic-metering-service/pom.xml

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

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java

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

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/ImageTool.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java

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

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

Show line notes below