-
# Conflicts: # .gitignore # .idea/misc.xml # .idea/workspace.xml # huaheng.iml
-
# Conflicts: # src/main/java/com/huaheng/mobile/receipt/MobileOneByOneReceiptController.java # src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java # src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
-
2. 取消任务要解锁托盘 3. 修正一些接口名字
-
因包名冲突删除job文件