-
# 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
-
在数据库task_header表添加优先级priority栏目，默认值100 在taskHeader.html页面，列表菜单重量前添加了优先级栏目，左上角添加最大值，最小值按钮
-
# Conflicts: # src/main/java/com/huaheng/pc/inventory/InventoryMaterialSummary/domain/InventoryMaterialSummary.java # src/main/java/com/huaheng/pc/inventory/InventoryMaterialSummary/service/InventoryMaterialSummaryServiceImpl.java