wms / wms_xianyangming · Commits

# Conflicts:
#	src/main/java/com/huaheng/pc/config/address/domain/Address.java
#	src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
#	src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
#	src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java

2.去掉一些重复无用代码

 Conflicts:
	src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java
	src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
	src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
	src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
	src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java
	src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java
	src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
	src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml
	src/main/resources/templates/config/material/material.html

# Conflicts:
#	src/main/resources/application-druid.properties