•  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
    DESKTOP-AO0VKC8\mahua authored
     
    Browse Code »