-
# 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/resources/mybatis/general/CompanyMapper.xml
-
# Conflicts: # src/main/resources/templates/general/customer/customer.html
-
# Conflicts: # src/main/resources/templates/general/customer/customer.html
-
# Conflicts: # src/main/resources/templates/general/customer/customer.html
-
2.修改配置文件从YML到properties，方便编辑 3.修改库区容量页面报错问题 4.修改出入库，将主表和明细关联起来