-
# Conflicts: # src/main/java/com/huaheng/pc/task/task/service/ITaskService.java # src/main/resources/templates/receipt/receiving/add.html
-
# Conflicts: # src/main/java/com/huaheng/pc/general/company/mapper/CompanyMapper.java # src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java # src/main/resources/mybatis/general/CompanyMapper.xml # src/main/resources/templates/shipment/shipmentHeader/add.html 修改货主bug,将文本框改为下拉框,彻底完善货主部分
-
# Conflicts: # src/main/java/com/huaheng/pc/inventory/inventory/mapper/InventoryMapper.java # src/main/resources/mybatis/inventory/InventoryMapper.xml # src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html 修改货主表单的bug
-
# Conflicts: # src/main/java/com/huaheng/pc/inventory/inventory/mapper/InventoryMapper.java # src/main/resources/mybatis/inventory/InventoryMapper.xml # src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html