# Conflicts:
#	performance-web/src/main/java/com/clx/performance/job/TruckTraceJob.java
#	performance-web/src/main/java/com/clx/performance/service/OrderChildService.java


Former-commit-id: 5f873144

Former-commit-id: 8c5bdaf2

Former-commit-id: 9161e23d

Former-commit-id: 8f761835

Former-commit-id: 1906d269

Former-commit-id: ef3889e0

Former-commit-id: 70f58f50

Former-commit-id: db83c52f

Former-commit-id: 5c926f7e

Former-commit-id: 2402f3e8

Former-commit-id: b4a841e4

Former-commit-id: 32377850

Merge remote-tracking branch 'origin/v18.5_pound_list_ocr_20240701' into v18.5_pound_list_ocr_20240701

Former-commit-id: 5036a952

Former-commit-id: 829527a4

Former-commit-id: 313f6e13

Former-commit-id: f6114678

Former-commit-id: 7b449e55

Former-commit-id: 85230ef8