曹鹏飞 536c5e807f Merge branch 'refs/heads/qms/develop' into feature/NoScanning ... # Conflicts: # nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DepartmentControllerService.java # nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java # nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java # nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java		2026-05-30 16:53:30 +08:00
..
src/main/java/com/nflg/wms/common	Merge branch 'refs/heads/qms/develop' into feature/NoScanning	2026-05-30 16:53:30 +08:00
pom.xml	fix(barcode): 修复条码打印数量计算逻辑	2026-01-16 10:19:25 +08:00