wms / wms_shanghaijiaoda · Commits

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

2. 增加接口移动端获取token接口

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

 Conflicts:
	src/main/java/com/huaheng/mobile/receipt/MobileOneByOneReceiptController.java

# 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. 修正一些接口名字

# Conflicts:
#	src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
#	src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
#	src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java

任务界面 把操作按钮提前