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

Fork: 0

wangpeng / casic-metering

Browse code Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java # casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java dev release
commit 037b95f516bccc5d19c2ca1eb5d852faec63750d 2 parents ee2f976 + 97788cf xiezhuangz authored on 6 Jan 2023

Browse code

# Conflicts:
#	casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
#	casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java

dev release

commit 037b95f516bccc5d19c2ca1eb5d852faec63750d

2 parents ee2f976 + 97788cf

xiezhuangz authored on 6 Jan 2023

Patch

Unified Split

Showing 13 changed files

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

Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java 100644 → 0

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java 0 → 100644

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java 0 → 100644

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java 0 → 100644

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

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

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

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

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

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

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

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

Show line notes below